Merge tag 'dm-3.17-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / mesh.c

diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index e8a04ae3276a703a64d1c33d987624ef13d4e42a..57a95e2c3442c7d3fa52001a610fb51663412259 100644 (file)
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1230,7 +1230,7 @@ static void handle_msgin(struct mesh_state *ms)
                                ms->msgphase = msg_out;
                        } else if (code != cmd->device->lun + IDENTIFY_BASE) {
                                printk(KERN_WARNING "mesh: lun mismatch "
-                                      "(%d != %d) on reselection from "
+                                      "(%d != %llu) on reselection from "
                                       "target %d\n", code - IDENTIFY_BASE,
                                       cmd->device->lun, ms->conn_tgt);
                        }
@@ -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;