android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] qla2xxx: Dont clear drv active on iospace config failure.

Browse Source 
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Saurav Kashyap 2012-11-21 02:40:43 -05:00 committed by James Bottomley
parent a720101de3
commit 0a63ad12e3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/qla2xxx/qla_nx.c
View File

@ -1655,7 +1655,6 @@ qla82xx_iospace_config(struct qla_hw_data *ha)
if (!ha->nx_pcibase) { if (!ha->nx_pcibase) {
ql_log_pci(ql_log_fatal, ha->pdev, 0x000e, ql_log_pci(ql_log_fatal, ha->pdev, 0x000e,
"Cannot remap pcibase MMIO, aborting.\n"); "Cannot remap pcibase MMIO, aborting.\n");
pci_release_regions(ha->pdev);
goto iospace_error_exit; goto iospace_error_exit;
} }
@ -1670,7 +1669,6 @@ qla82xx_iospace_config(struct qla_hw_data *ha)
if (!ha->nxdb_wr_ptr) { if (!ha->nxdb_wr_ptr) {
ql_log_pci(ql_log_fatal, ha->pdev, 0x000f, ql_log_pci(ql_log_fatal, ha->pdev, 0x000f,
"Cannot remap MMIO, aborting.\n"); "Cannot remap MMIO, aborting.\n");
pci_release_regions(ha->pdev);
goto iospace_error_exit; goto iospace_error_exit;
} }

6
drivers/scsi/qla2xxx/qla_os.c
View File

@ -2367,7 +2367,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
/* Configure PCI I/O space */ /* Configure PCI I/O space */
ret = ha->isp_ops->iospace_config(ha); ret = ha->isp_ops->iospace_config(ha);
if (ret) if (ret)
goto probe_hw_failed; goto iospace_config_failed;
ql_log_pci(ql_log_info, pdev, 0x001d, ql_log_pci(ql_log_info, pdev, 0x001d,
"Found an ISP%04X irq %d iobase 0x%p.\n", "Found an ISP%04X irq %d iobase 0x%p.\n",
@ -2678,6 +2678,10 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
qla82xx_idc_lock(ha); qla82xx_idc_lock(ha);
qla82xx_clear_drv_active(ha); qla82xx_clear_drv_active(ha);
qla82xx_idc_unlock(ha); qla82xx_idc_unlock(ha);
}
iospace_config_failed:
if (IS_QLA82XX(ha)) {
if (!ha->nx_pcibase)
iounmap((device_reg_t __iomem *)ha->nx_pcibase); iounmap((device_reg_t __iomem *)ha->nx_pcibase);
if (!ql2xdbwr) if (!ql2xdbwr)
iounmap((device_reg_t __iomem *)ha->nxdb_wr_ptr); iounmap((device_reg_t __iomem *)ha->nxdb_wr_ptr);