Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / irda / ali-ircc.c

diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 9cea451a60818428bfbdcc08e16dab1a09a89bb2..3adb43ce138fa1b8d3bda8a31d25f14f3aa1c696 100644 (file)
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -352,21 +352,19 @@ static int ali_ircc_open(int i, chipio_t *info)
        /* Allocate memory if needed */
        self->rx_buff.head =
                dma_alloc_coherent(NULL, self->rx_buff.truesize,
-                                  &self->rx_buff_dma, GFP_KERNEL);
+                                  &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
        if (self->rx_buff.head == NULL) {
                err = -ENOMEM;
                goto err_out2;
        }
-       memset(self->rx_buff.head, 0, self->rx_buff.truesize);
        
        self->tx_buff.head =
                dma_alloc_coherent(NULL, self->tx_buff.truesize,
-                                  &self->tx_buff_dma, GFP_KERNEL);
+                                  &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
        if (self->tx_buff.head == NULL) {
                err = -ENOMEM;
                goto err_out3;
        }
-       memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
        self->rx_buff.in_frame = FALSE;
        self->rx_buff.state = OUTSIDE_FRAME;