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

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

diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 2a4f2f153244fd86e3991a290cd98a2cbaefd3da..9cf836b57c4920c40a1455514b0158ecb584f509 100644 (file)
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -431,22 +431,20 @@ static int __init nsc_ircc_open(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 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 out3;
        }
-       memset(self->tx_buff.head, 0, self->tx_buff.truesize);
 
        self->rx_buff.in_frame = FALSE;
        self->rx_buff.state = OUTSIDE_FRAME;