Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net

[~andy/linux] / drivers / net / irda / w83977af_ir.c

diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index bb8857a158a61efb8f5db3e0473899cf52855448..e641bb2403624fdd91fb565ea646d70d03c2c5fd 100644 (file)
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -215,16 +215,16 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq,
        
        /* Allocate memory if needed */
        self->rx_buff.head =
-               dma_alloc_coherent(NULL, self->rx_buff.truesize,
-                                  &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
+               dma_zalloc_coherent(NULL, self->rx_buff.truesize,
+                                   &self->rx_buff_dma, GFP_KERNEL);
        if (self->rx_buff.head == NULL) {
                err = -ENOMEM;
                goto err_out1;
        }
 
        self->tx_buff.head =
-               dma_alloc_coherent(NULL, self->tx_buff.truesize,
-                                  &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
+               dma_zalloc_coherent(NULL, self->tx_buff.truesize,
+                                   &self->tx_buff_dma, GFP_KERNEL);
        if (self->tx_buff.head == NULL) {
                err = -ENOMEM;
                goto err_out2;