diff options
| author | Michael Buesch <mb@bu3sch.de> | 2008-06-20 11:40:46 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-06-25 10:56:16 -0400 |
| commit | 2f9ec47d0954f9d2e5a00209c2689cbc477a8c89 (patch) | |
| tree | 5a10d3b33f105fef01cddc186f361d752b17b65d | |
| parent | 7b3abfc87ec13a81b255012b6e1bd4caeeb05aec (diff) | |
| download | linux-3.10-2f9ec47d0954f9d2e5a00209c2689cbc477a8c89.tar.gz linux-3.10-2f9ec47d0954f9d2e5a00209c2689cbc477a8c89.tar.bz2 linux-3.10-2f9ec47d0954f9d2e5a00209c2689cbc477a8c89.zip | |
b43legacy: Fix possible NULL pointer dereference in DMA code
This fixes a possible NULL pointer dereference in an error path of the
DMA allocation error checking code. This is also necessary for a future
DMA API change that is on its way into the mainline kernel that adds
an additional dev parameter to dma_mapping_error().
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Cc: stable <stable@kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/b43legacy/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c index c990f87b107..93ddc1cbcc8 100644 --- a/drivers/net/wireless/b43legacy/dma.c +++ b/drivers/net/wireless/b43legacy/dma.c @@ -876,6 +876,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev, if (!ring) goto out; ring->type = type; + ring->dev = dev; nr_slots = B43legacy_RXRING_SLOTS; if (for_tx) @@ -922,7 +923,6 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev, DMA_TO_DEVICE); } - ring->dev = dev; ring->nr_slots = nr_slots; ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index); ring->index = controller_index; |