diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-11-25 15:30:10 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 15:30:10 -0800 |
| commit | f19f8d8ebc0b392c01082e0feb44ec152cc47a30 (patch) | |
| tree | f45f5391e97e29d5ef0003fc90f34bf0e18ba20f /drivers/net/wireless/b43legacy/dma.c | |
| parent | f984370913d3ba5d13806cc8ac6fc26f8ebd1694 (diff) | |
| parent | 6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (diff) | |
Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal
Diffstat (limited to 'drivers/net/wireless/b43legacy/dma.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/dma.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c index 42eb26c99e1..b2ed1795130 100644 --- a/drivers/net/wireless/b43legacy/dma.c +++ b/drivers/net/wireless/b43legacy/dma.c @@ -806,12 +806,9 @@ static int b43legacy_dma_set_mask(struct b43legacy_wldev *dev, u64 mask) /* Try to set the DMA mask. If it fails, try falling back to a * lower mask, as we can always also support a lower one. */ while (1) { - err = dma_set_mask(dev->dev->dma_dev, mask); - if (!err) { - err = dma_set_coherent_mask(dev->dev->dma_dev, mask); - if (!err) - break; - } + err = dma_set_mask_and_coherent(dev->dev->dma_dev, mask); + if (!err) + break; if (mask == DMA_BIT_MASK(64)) { mask = DMA_BIT_MASK(32); fallback = true; |