Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve...

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

diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 522570d297ca370e37e92279d734f9fd76701492..7e33a61c1ba45ed91db2b0fe86d4385eaac1e762 100644 (file)
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -1125,23 +1125,19 @@ static int inia100_probe_one(struct pci_dev *pdev,
 
        /* Get total memory needed for SCB */
        sz = ORC_MAXQUEUE * sizeof(struct orc_scb);
-       host->scb_virt = pci_alloc_consistent(pdev, sz,
-                       &host->scb_phys);
+       host->scb_virt = pci_zalloc_consistent(pdev, sz, &host->scb_phys);
        if (!host->scb_virt) {
                printk("inia100: SCB memory allocation error\n");
                goto out_host_put;
        }
-       memset(host->scb_virt, 0, sz);
 
        /* Get total memory needed for ESCB */
        sz = ORC_MAXQUEUE * sizeof(struct orc_extended_scb);
-       host->escb_virt = pci_alloc_consistent(pdev, sz,
-                       &host->escb_phys);
+       host->escb_virt = pci_zalloc_consistent(pdev, sz, &host->escb_phys);
        if (!host->escb_virt) {
                printk("inia100: ESCB memory allocation error\n");
                goto out_free_scb_array;
        }
-       memset(host->escb_virt, 0, sz);
 
        biosaddr = host->BIOScfg;
        biosaddr = (biosaddr << 4);