From 768a775dd11a231517a0158b337f62853038ee2a Mon Sep 17 00:00:00 2001
From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Wed, 21 Nov 2012 02:40:43 -0500
Subject: [PATCH] --- yaml --- r: 343759 b: refs/heads/master c:
 0a63ad12e3efe81c5809a5e9418f19947de88da2 h: refs/heads/master i:   343757:
 8d90b553b4263c7db0512bd5481a702dea4c6814   343755:
 cd2f5028092418fffc8aa394012cb87af1e263f3   343751:
 2cd165d6ee8f3a708f4d9ffd46332c65ba767135   343743:
 fa8536d2740b2655859776819c06797c3fca4491 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_nx.c | 2 --
 trunk/drivers/scsi/qla2xxx/qla_os.c | 8 ++++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d2e1a3b922cd..f87676fc22a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a720101de3acd1549681216ebac2b1eb78723561
+refs/heads/master: 0a63ad12e3efe81c5809a5e9418f19947de88da2
diff --git a/trunk/drivers/scsi/qla2xxx/qla_nx.c b/trunk/drivers/scsi/qla2xxx/qla_nx.c
index 45f619101cf9..3e3f593bada3 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_nx.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_nx.c
@@ -1655,7 +1655,6 @@ qla82xx_iospace_config(struct qla_hw_data *ha)
 	if (!ha->nx_pcibase) {
 		ql_log_pci(ql_log_fatal, ha->pdev, 0x000e,
 		    "Cannot remap pcibase MMIO, aborting.\n");
-		pci_release_regions(ha->pdev);
 		goto iospace_error_exit;
 	}
 
@@ -1670,7 +1669,6 @@ qla82xx_iospace_config(struct qla_hw_data *ha)
 		if (!ha->nxdb_wr_ptr) {
 			ql_log_pci(ql_log_fatal, ha->pdev, 0x000f,
 			    "Cannot remap MMIO, aborting.\n");
-			pci_release_regions(ha->pdev);
 			goto iospace_error_exit;
 		}
 
diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c
index 6af369b1dafd..3a1661cf8c1e 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_os.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_os.c
@@ -2367,7 +2367,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	/* Configure PCI I/O space */
 	ret = ha->isp_ops->iospace_config(ha);
 	if (ret)
-		goto probe_hw_failed;
+		goto iospace_config_failed;
 
 	ql_log_pci(ql_log_info, pdev, 0x001d,
 	    "Found an ISP%04X irq %d iobase 0x%p.\n",
@@ -2678,7 +2678,11 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 		qla82xx_idc_lock(ha);
 		qla82xx_clear_drv_active(ha);
 		qla82xx_idc_unlock(ha);
-		iounmap((device_reg_t __iomem *)ha->nx_pcibase);
+	}
+iospace_config_failed:
+	if (IS_QLA82XX(ha)) {
+		if (!ha->nx_pcibase)
+			iounmap((device_reg_t __iomem *)ha->nx_pcibase);
 		if (!ql2xdbwr)
 			iounmap((device_reg_t __iomem *)ha->nxdb_wr_ptr);
 	} else {