diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-27 14:27:33 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-27 14:27:33 +1000 |
| commit | f422e5726081d9073956687488f8279194544309 (patch) | |
| tree | 20c90c5a614f4ac2cb44f0078df45e1d6fe79c48 /drivers/scsi/be2iscsi/be_mgmt.c | |
| parent | 3c45d5624cac27be5e4bc1341033d0c7ad43f2b2 (diff) | |
| parent | eaef71b00483a65ebf7edb32ac13cf6d7268f441 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/scsi/be2iscsi/be_mgmt.c')
| -rw-r--r-- | drivers/scsi/be2iscsi/be_mgmt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c index 07934b0b9ee1..2cba0e0a0160 100644 --- a/drivers/scsi/be2iscsi/be_mgmt.c +++ b/drivers/scsi/be2iscsi/be_mgmt.c @@ -900,13 +900,12 @@ free_cmd: static int mgmt_alloc_cmd_data(struct beiscsi_hba *phba, struct be_dma_mem *cmd, int iscsi_cmd, int size) { - cmd->va = pci_alloc_consistent(phba->ctrl.pdev, size, &cmd->dma); + cmd->va = pci_zalloc_consistent(phba->ctrl.pdev, size, &cmd->dma); if (!cmd->va) { beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG, "BG_%d : Failed to allocate memory for if info\n"); return -ENOMEM; } - memset(cmd->va, 0, size); cmd->size = size; be_cmd_hdr_prepare(cmd->va, CMD_SUBSYSTEM_ISCSI, iscsi_cmd, size); return 0; |