commit 46801ba698b3366cf8d293d9f3d4253b6fd5210b
author Vikas Chaudhary <vikas.chaudhary@qlogic.com> Mon Feb 13 18:30:45 2012 +0530
committer James Bottomley <JBottomley@Parallels.com> Sun Feb 19 09:33:01 2012 -0600
tree d088dda7648b25ef7826ce2dd87064f116b55132
parent badc5b9996005a388e94223d43eebba6698b7ac4

[SCSI] qla4xxx: Proper detection of firmware abort error code for ISP82xx

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

drivers/scsi/qla4xxx/ql4_os.c

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 3339cc1..2cd2077 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -2165,7 +2165,7 @@
 				halt_status = qla4_8xxx_rd_32(ha,
 						QLA82XX_PEG_HALT_STATUS1);
 
-				if (LSW(MSB(halt_status)) == 0x67)
+				if (QLA82XX_FWERROR_CODE(halt_status) == 0x67)
 					ql4_printk(KERN_ERR, ha, "%s:"
 						   " Firmware aborted with"
 						   " error code 0x00006700."