From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Wed, 11 Apr 2012 07:02:51 +0000 (+0530)
Subject: qla2xxx: Proper detection of firmware abort error code for ISP82xx.
X-Git-Tag: v2.6.39-400.9.0~423^2~68
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ecc2715f18d9a1ddf74c3fbe7316cd42130d778f;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Proper detection of firmware abort error code for ISP82xx.

JIRA Key: V2632FC-160

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 1a0ca8cf76dff..a8f81dba3b2db 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -3369,7 +3369,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(MSB(LSW(halt_status)) == 0x67)
+				if (((halt_status & 0x1fffff00) >> 8) == 0x67)
 					ql_log(ql_log_warn, vha, 0xb052,
 					    "Firmware aborted with "
 					    "error code 0x00006700. Device is "