summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiridhar Malavali <giridhar.malavali@qlogic.com>2012-02-09 11:14:12 -0800
committerJames Bottomley <JBottomley@Parallels.com>2012-02-18 08:49:58 -0600
commit2cc97965e4f6e84792b958d4ad10631274d42834 (patch)
tree098fb6aeaf7bd1716dc722f1917a2fd4bc728448
parent5a034bb3c33aad59769e7289716c8d1f075b3894 (diff)
downloadlinux-stable-2cc97965e4f6e84792b958d4ad10631274d42834.tar.gz
linux-stable-2cc97965e4f6e84792b958d4ad10631274d42834.tar.bz2
linux-stable-2cc97965e4f6e84792b958d4ad10631274d42834.zip
[SCSI] qla2xxx: Proper detection of firmware abort error code for ISP82xx.
Signed-off-by: Giridhar Malavali <giridhar.malavali@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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index bb06c20a822e..270ba3130fde 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -3379,7 +3379,7 @@ void qla82xx_watchdog(scsi_qla_host_t *vha)
QLA82XX_CRB_PEG_NET_3 + 0x3c),
qla82xx_rd_32(ha,
QLA82XX_CRB_PEG_NET_4 + 0x3c));
- if (LSW(MSB(halt_status)) == 0x67)
+ if (((halt_status & 0x1fffff00) >> 8) == 0x67)
ql_log(ql_log_warn, vha, 0xb052,
"Firmware aborted with "
"error code 0x00006700. Device is "