diff options
Diffstat (limited to 'drivers/scsi/a100u2w.c')
-rw-r--r-- | drivers/scsi/a100u2w.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c index 522570d297ca..7e33a61c1ba4 100644 --- a/drivers/scsi/a100u2w.c +++ b/drivers/scsi/a100u2w.c | |||
@@ -1125,23 +1125,19 @@ static int inia100_probe_one(struct pci_dev *pdev, | |||
1125 | 1125 | ||
1126 | /* Get total memory needed for SCB */ | 1126 | /* Get total memory needed for SCB */ |
1127 | sz = ORC_MAXQUEUE * sizeof(struct orc_scb); | 1127 | sz = ORC_MAXQUEUE * sizeof(struct orc_scb); |
1128 | host->scb_virt = pci_alloc_consistent(pdev, sz, | 1128 | host->scb_virt = pci_zalloc_consistent(pdev, sz, &host->scb_phys); |
1129 | &host->scb_phys); | ||
1130 | if (!host->scb_virt) { | 1129 | if (!host->scb_virt) { |
1131 | printk("inia100: SCB memory allocation error\n"); | 1130 | printk("inia100: SCB memory allocation error\n"); |
1132 | goto out_host_put; | 1131 | goto out_host_put; |
1133 | } | 1132 | } |
1134 | memset(host->scb_virt, 0, sz); | ||
1135 | 1133 | ||
1136 | /* Get total memory needed for ESCB */ | 1134 | /* Get total memory needed for ESCB */ |
1137 | sz = ORC_MAXQUEUE * sizeof(struct orc_extended_scb); | 1135 | sz = ORC_MAXQUEUE * sizeof(struct orc_extended_scb); |
1138 | host->escb_virt = pci_alloc_consistent(pdev, sz, | 1136 | host->escb_virt = pci_zalloc_consistent(pdev, sz, &host->escb_phys); |
1139 | &host->escb_phys); | ||
1140 | if (!host->escb_virt) { | 1137 | if (!host->escb_virt) { |
1141 | printk("inia100: ESCB memory allocation error\n"); | 1138 | printk("inia100: ESCB memory allocation error\n"); |
1142 | goto out_free_scb_array; | 1139 | goto out_free_scb_array; |
1143 | } | 1140 | } |
1144 | memset(host->escb_virt, 0, sz); | ||
1145 | 1141 | ||
1146 | biosaddr = host->BIOScfg; | 1142 | biosaddr = host->BIOScfg; |
1147 | biosaddr = (biosaddr << 4); | 1143 | biosaddr = (biosaddr << 4); |