aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/vlsi_ir.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-08-08 17:24:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 18:57:29 -0400
commit38537b7f558bca5375b87f0c75ec5cfa2ed69dab (patch)
tree6d07b21cdff6929f980bebc3186f8240dedeab52 /drivers/net/irda/vlsi_ir.c
parent440c734fefdabcf9caf4532e9bc51313cd0c546b (diff)
irda: use pci_zalloc_consistent
Remove the now unnecessary memset too. Signed-off-by: Joe Perches <joe@perches.com> Cc: Samuel Ortiz <samuel@sortiz.org> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/irda/vlsi_ir.c')
-rw-r--r--drivers/net/irda/vlsi_ir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 485006604bbc..58ef59469dd0 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -485,13 +485,13 @@ static int vlsi_create_hwif(vlsi_irda_dev_t *idev)
485 idev->virtaddr = NULL; 485 idev->virtaddr = NULL;
486 idev->busaddr = 0; 486 idev->busaddr = 0;
487 487
488 ringarea = pci_alloc_consistent(idev->pdev, HW_RING_AREA_SIZE, &idev->busaddr); 488 ringarea = pci_zalloc_consistent(idev->pdev, HW_RING_AREA_SIZE,
489 &idev->busaddr);
489 if (!ringarea) { 490 if (!ringarea) {
490 IRDA_ERROR("%s: insufficient memory for descriptor rings\n", 491 IRDA_ERROR("%s: insufficient memory for descriptor rings\n",
491 __func__); 492 __func__);
492 goto out; 493 goto out;
493 } 494 }
494 memset(ringarea, 0, HW_RING_AREA_SIZE);
495 495
496 hwmap = (struct ring_descr_hw *)ringarea; 496 hwmap = (struct ring_descr_hw *)ringarea;
497 idev->rx_ring = vlsi_alloc_ring(idev->pdev, hwmap, ringsize[1], 497 idev->rx_ring = vlsi_alloc_ring(idev->pdev, hwmap, ringsize[1],