From 16f4bfa4d11860f10af1257dd18c13eebb757623 Mon Sep 17 00:00:00 2001
From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Wed, 22 Aug 2012 14:21:25 -0400
Subject: [PATCH] --- yaml --- r: 328857 b: refs/heads/master c:
 1459c0e16d1aef234991ff2bad516404695057db h: refs/heads/master i:   328855:
 1306b8cfc3af08550eba38b6dd674f12f8407ed6 v: v3

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

diff --git a/[refs] b/[refs]
index 8f923fe9e855..24e3a4fdd16c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf5b8ad7bd7ad56fc4d4132996babb74443672d6
+refs/heads/master: 1459c0e16d1aef234991ff2bad516404695057db
diff --git a/trunk/drivers/scsi/qla2xxx/qla_nx.c b/trunk/drivers/scsi/qla2xxx/qla_nx.c
index 3a054445fca1..7807444418ff 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_nx.c
+++ b/trunk/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;