From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Mon, 30 Jul 2012 14:30:50 +0000 (-0700)
Subject: qla2xxx: Enclose adapter related calls in adapter check in failed state handler.
X-Git-Tag: v2.6.39-400.9.0~407
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0b6d11eefce92620392b332f642f89dc46d74530;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Enclose adapter related calls in adapter check in failed state handler.

JIRA Key: V2632FC-243
---

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 099564b2cc4d..557ca08c6e23 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -3028,8 +3028,10 @@ qla8xxx_dev_failed_handler(scsi_qla_host_t *vha)
 	ql_log(ql_log_fatal, vha, 0x00b8,
 	    "Disabling the board.\n");
 
-	qla82xx_clear_drv_active(ha);
-	qla82xx_idc_unlock(ha);
+	if (IS_QLA82XX(ha)) {
+		qla82xx_clear_drv_active(ha);
+		qla82xx_idc_unlock(ha);
+	}
 
 	/* Set DEV_FAILED flag to disable timer */
 	vha->device_flags |= DFLG_DEV_FAILED;