diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-17 18:22:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-17 18:22:41 +1000 |
| commit | e42321ef0002b517c9fefdf43cc39e24462b16cf (patch) | |
| tree | 70e013f5f7f45da559afa8167039e37e5eab96ff /drivers/scsi/mesh.c | |
| parent | 1e2d23cc747df325a0ff199dd4ac250e1d8cc7a0 (diff) | |
| parent | aa661602d17c90be3fc9c2f22359c17c98db4c11 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/scsi/mesh.c')
| -rw-r--r-- | drivers/scsi/mesh.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index 7a6160f172ce..57a95e2c3442 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c @@ -1915,14 +1915,12 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match) /* We use the PCI APIs for now until the generic one gets fixed * enough or until we get some macio-specific versions */ - dma_cmd_space = pci_alloc_consistent(macio_get_pci_dev(mdev), - ms->dma_cmd_size, - &dma_cmd_bus); + dma_cmd_space = pci_zalloc_consistent(macio_get_pci_dev(mdev), + ms->dma_cmd_size, &dma_cmd_bus); if (dma_cmd_space == NULL) { printk(KERN_ERR "mesh: can't allocate DMA table\n"); goto out_unmap; } - memset(dma_cmd_space, 0, ms->dma_cmd_size); ms->dma_cmds = (struct dbdma_cmd *) DBDMA_ALIGN(dma_cmd_space); ms->dma_cmd_space = dma_cmd_space; |