diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-08 16:22:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-08 16:22:15 +1000 |
| commit | c39eb7727ca46d1819b66ccb4518376c9f38f568 (patch) | |
| tree | 7dc3b374d1433c72514634a3969515e2c87f7e96 /drivers/scsi/pm8001/pm8001_sas.c | |
| parent | 9028bb948d3c3a5bfd5c4c66854a34f9a0d3c59d (diff) | |
| parent | fe6140d1e45157761c950abdbab3e9c1777b1e44 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/scsi/pm8001/pm8001_sas.c')
| -rw-r--r-- | drivers/scsi/pm8001/pm8001_sas.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index 34cea8291772..76570e6a547d 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c @@ -116,13 +116,12 @@ int pm8001_mem_alloc(struct pci_dev *pdev, void **virt_addr, u64 align_offset = 0; if (align) align_offset = (dma_addr_t)align - 1; - mem_virt_alloc = - pci_alloc_consistent(pdev, mem_size + align, &mem_dma_handle); + mem_virt_alloc = pci_zalloc_consistent(pdev, mem_size + align, + &mem_dma_handle); if (!mem_virt_alloc) { pm8001_printk("memory allocation error\n"); return -1; } - memset((void *)mem_virt_alloc, 0, mem_size+align); *pphys_addr = mem_dma_handle; phys_align = (*pphys_addr + align_offset) & ~align_offset; *virt_addr = (void *)mem_virt_alloc + phys_align - *pphys_addr; |