diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-16 12:17:12 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-16 12:17:12 -0500 |
| commit | b5e4156743c5d42b736936be7a9ee8d72e0e4ac9 (patch) | |
| tree | f0edde33e7b2502ab35a4f63be1a8be31f5f4b6a /drivers/net/wireless/rt2x00/rt2x00pci.c | |
| parent | 6b35308850e1679741e8b646cfb7bb3ab5369888 (diff) | |
| parent | b1d771ee33c6e4006676002b9d74abf45b71d3d6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 2449d785cf8d..868ca19b13ea 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c | |||
| @@ -105,7 +105,7 @@ static int rt2x00pci_alloc_queue_dma(struct rt2x00_dev *rt2x00dev, | |||
| 105 | */ | 105 | */ |
| 106 | addr = dma_alloc_coherent(rt2x00dev->dev, | 106 | addr = dma_alloc_coherent(rt2x00dev->dev, |
| 107 | queue->limit * queue->desc_size, | 107 | queue->limit * queue->desc_size, |
| 108 | &dma, GFP_KERNEL | GFP_DMA); | 108 | &dma, GFP_KERNEL); |
| 109 | if (!addr) | 109 | if (!addr) |
| 110 | return -ENOMEM; | 110 | return -ENOMEM; |
| 111 | 111 | ||