diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 17:55:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 17:55:53 +1000 |
| commit | 168e789e7c0f491242c9b1acf716fee7bf42b677 (patch) | |
| tree | eddf28e13672c729b336dcc8b179a755802b2be6 /drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c | |
| parent | 460f7ed52f4292f25871946ba5aa5fec24447682 (diff) | |
| parent | b219323efaf9a57cd1e28542fb8d42a9624960d5 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c index 6f6be57f4690..b8d5270359cd 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c @@ -129,14 +129,12 @@ netxen_get_minidump_template(struct netxen_adapter *adapter) return NX_RCODE_INVALID_ARGS; } - addr = pci_alloc_consistent(adapter->pdev, size, &md_template_addr); - + addr = pci_zalloc_consistent(adapter->pdev, size, &md_template_addr); if (!addr) { dev_err(&adapter->pdev->dev, "Unable to allocate dmable memory for template.\n"); return -ENOMEM; } - memset(addr, 0, size); memset(&cmd, 0, sizeof(cmd)); memset(&cmd.rsp, 1, sizeof(struct _cdrp_cmd)); cmd.req.cmd = NX_CDRP_CMD_GET_TEMP_HDR; |