aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/ali-ircc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/irda/ali-ircc.c')
-rw-r--r--drivers/net/irda/ali-ircc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 9cea451a6081..3adb43ce138f 100644
--- 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)
352 /* Allocate memory if needed */ 352 /* Allocate memory if needed */
353 self->rx_buff.head = 353 self->rx_buff.head =
354 dma_alloc_coherent(NULL, self->rx_buff.truesize, 354 dma_alloc_coherent(NULL, self->rx_buff.truesize,
355 &self->rx_buff_dma, GFP_KERNEL); 355 &self->rx_buff_dma, GFP_KERNEL | __GFP_ZERO);
356 if (self->rx_buff.head == NULL) { 356 if (self->rx_buff.head == NULL) {
357 err = -ENOMEM; 357 err = -ENOMEM;
358 goto err_out2; 358 goto err_out2;
359 } 359 }
360 memset(self->rx_buff.head, 0, self->rx_buff.truesize);
361 360
362 self->tx_buff.head = 361 self->tx_buff.head =
363 dma_alloc_coherent(NULL, self->tx_buff.truesize, 362 dma_alloc_coherent(NULL, self->tx_buff.truesize,
364 &self->tx_buff_dma, GFP_KERNEL); 363 &self->tx_buff_dma, GFP_KERNEL | __GFP_ZERO);
365 if (self->tx_buff.head == NULL) { 364 if (self->tx_buff.head == NULL) {
366 err = -ENOMEM; 365 err = -ENOMEM;
367 goto err_out3; 366 goto err_out3;
368 } 367 }
369 memset(self->tx_buff.head, 0, self->tx_buff.truesize);
370 368
371 self->rx_buff.in_frame = FALSE; 369 self->rx_buff.in_frame = FALSE;
372 self->rx_buff.state = OUTSIDE_FRAME; 370 self->rx_buff.state = OUTSIDE_FRAME;