summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaurav Kashyap2012-08-22 20:21:25 +0200
committerJames Bottomley2012-09-24 10:10:52 +0200
commit1459c0e16d1aef234991ff2bad516404695057db (patch)
treee797db4d6c685e0350fa7f24fa5969177d3c0b5b
parent[SCSI] qla2xxx: Fix for handling some error conditions in loopback. (diff)
downloadkernel-qcow2-linux-1459c0e16d1aef234991ff2bad516404695057db.tar.gz
kernel-qcow2-linux-1459c0e16d1aef234991ff2bad516404695057db.tar.xz
kernel-qcow2-linux-1459c0e16d1aef234991ff2bad516404695057db.zip
[SCSI] qla2xxx: Enclose adapter related calls in adapter check in failed state handler.
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/qla2xxx/qla_nx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 3a054445fca1..7807444418ff 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;