diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-18 17:56:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-18 17:56:59 +1000 |
| commit | fb72985a0e9af81c2dd0714ec3ffc052a8886b8a (patch) | |
| tree | 672f6c1ee62e25d9b291baa5994b3c91b6f5a9f7 /drivers/net/ethernet/marvell/sky2.c | |
| parent | 706bf313be879cb232ccb0f7888f4cea85c798bf (diff) | |
| parent | 675c7e4802e35f474c26b14a3417af93acd0470c (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/net/ethernet/marvell/sky2.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 69693384b58c..59915144aabb 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -1622,11 +1622,10 @@ static int sky2_alloc_buffers(struct sky2_port *sky2) if (!sky2->tx_ring) goto nomem; - sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES, - &sky2->rx_le_map); + sky2->rx_le = pci_zalloc_consistent(hw->pdev, RX_LE_BYTES, + &sky2->rx_le_map); if (!sky2->rx_le) goto nomem; - memset(sky2->rx_le, 0, RX_LE_BYTES); sky2->rx_ring = kcalloc(sky2->rx_pending, sizeof(struct rx_ring_info), GFP_KERNEL); |