From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Thu, 9 Feb 2012 19:14:12 +0000 (-0800)
Subject: [SCSI] qla2xxx: Proper detection of firmware abort error code for ISP82xx.
X-Git-Tag: firefly_0821_release~3680^2~3167^2~243
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2cc97965e4f6e84792b958d4ad10631274d42834;p=firefly-linux-kernel-4.4.55.git

[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>
---

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 "