diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 13:48:12 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 13:48:12 -0700 |
| commit | 19ac97ff701ae3c0eda09dd88f590806f1c4eb2d (patch) | |
| tree | 62bb6b6358783dc9d6c26f480fa378843abb0235 /drivers/scsi/lpfc/lpfc_mbox.c | |
| parent | 24c20f10583647e30afe87b6f6d5e14bc7b1cbc6 (diff) | |
| parent | e785060ea3a1c8e37a8bc1449c79e36bff2b5b13 (diff) | |
| download | op-kernel-dev-19ac97ff701ae3c0eda09dd88f590806f1c4eb2d.zip op-kernel-dev-19ac97ff701ae3c0eda09dd88f590806f1c4eb2d.tar.gz | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-linus
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_mbox.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_mbox.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c index 1f292e2..06241f5 100644 --- a/drivers/scsi/lpfc/lpfc_mbox.c +++ b/drivers/scsi/lpfc/lpfc_mbox.c @@ -1811,12 +1811,12 @@ lpfc_sli4_config(struct lpfc_hba *phba, struct lpfcMboxq *mbox, * page, this is used as a priori size of SLI4_PAGE_SIZE for * the later DMA memory free. */ - viraddr = dma_alloc_coherent(&phba->pcidev->dev, SLI4_PAGE_SIZE, - &phyaddr, GFP_KERNEL); + viraddr = dma_zalloc_coherent(&phba->pcidev->dev, + SLI4_PAGE_SIZE, &phyaddr, + GFP_KERNEL); /* In case of malloc fails, proceed with whatever we have */ if (!viraddr) break; - memset(viraddr, 0, SLI4_PAGE_SIZE); mbox->sge_array->addr[pagen] = viraddr; /* Keep the first page for later sub-header construction */ if (pagen == 0) |
