Merge branch 'x86/jumplabel' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[~andy/linux] / drivers / net / wireless / b43 / dma.c

diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index f7c70b3a6ea978883f67f1abe0983cf51a476ada..c51d2dc489e45bd3a9b2aac36bf9fa2130453e72 100644 (file)
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -431,9 +431,9 @@ static int alloc_ringmemory(struct b43_dmaring *ring)
        u16 ring_mem_size = (ring->type == B43_DMA_64BIT) ?
                                B43_DMA64_RINGMEMSIZE : B43_DMA32_RINGMEMSIZE;
 
-       ring->descbase = dma_alloc_coherent(ring->dev->dev->dma_dev,
-                                           ring_mem_size, &(ring->dmabase),
-                                           GFP_KERNEL | __GFP_ZERO);
+       ring->descbase = dma_zalloc_coherent(ring->dev->dev->dma_dev,
+                                            ring_mem_size, &(ring->dmabase),
+                                            GFP_KERNEL);
        if (!ring->descbase)
                return -ENOMEM;