diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-17 18:22:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-17 18:22:41 +1000 |
| commit | e42321ef0002b517c9fefdf43cc39e24462b16cf (patch) | |
| tree | 70e013f5f7f45da559afa8167039e37e5eab96ff /drivers/net/irda/vlsi_ir.c | |
| parent | 1e2d23cc747df325a0ff199dd4ac250e1d8cc7a0 (diff) | |
| parent | aa661602d17c90be3fc9c2f22359c17c98db4c11 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/net/irda/vlsi_ir.c')
| -rw-r--r-- | drivers/net/irda/vlsi_ir.c | 4 |
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) idev->virtaddr = NULL; idev->busaddr = 0; - ringarea = pci_alloc_consistent(idev->pdev, HW_RING_AREA_SIZE, &idev->busaddr); + ringarea = pci_zalloc_consistent(idev->pdev, HW_RING_AREA_SIZE, + &idev->busaddr); if (!ringarea) { IRDA_ERROR("%s: insufficient memory for descriptor rings\n", __func__); goto out; } - memset(ringarea, 0, HW_RING_AREA_SIZE); hwmap = (struct ring_descr_hw *)ringarea; idev->rx_ring = vlsi_alloc_ring(idev->pdev, hwmap, ringsize[1], |