diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-27 04:26:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-27 04:26:58 -0700 |
| commit | 7ac3b02536c9ccfcc8aabc4c135a371ac4641805 (patch) | |
| tree | 69153ad8bef326cc3737b9a2a0e84199a40196b5 /drivers/net/wireless/b43legacy/dma.c | |
| parent | 3e3cda96d014b69f7723d1d4507897e5be6aceb7 (diff) | |
| parent | 66b5004d85164a6439d3ba1e7757734472ee2cac (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/b43legacy/dma.c')
| -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; |