From 6c83fc64e76a2e89998466e802b1aed3dabc2703 Mon Sep 17 00:00:00 2001
From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Thu, 11 Sep 2008 21:22:52 -0700
Subject: [PATCH] --- yaml --- r: 110591 b: refs/heads/master c:
 2d136938792ba04bf3b6bb2d3a2807dc05c396fc h: refs/heads/master i:   110589:
 a4824efb63d0abdb3ebf31aedabbd16747afdaf3   110587:
 4675068eae420455968dc8e84b2bc41902a58ba9   110583:
 be847e0968c810d289c290a2d47e95adbb473e96   110575:
 9188d0f72e02d215b663a7fcbae5f5ae688f252e   110559:
 bac8945044ece3457d277f64b9faba3b3b1179ea   110527:
 659262666628812087dbc3028aea9f9b5b27a760   110463:
 f3d548a7627b80a2951223896477d601185589da   110335:
 8002d46aea44625457ad99b10e73d9853b5852eb   110079:
 8578b17a5e535e1f7704e116e6d2b99b1dc32e1c   109567:
 f2cb4726af51029ba9c0ca0f8bf0973b640d47e7   108543:
 b556ed9a0c627a1c24390bd7981ba988607a53b7   106495:
 875b556c2a6c4cb2319b38607585bd7a1a584c3a v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_isr.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cc496a3e5f54..cfc9b29bf274 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc3ef7bc40bbede7bbd0bb395d6452a575e95efe
+refs/heads/master: 2d136938792ba04bf3b6bb2d3a2807dc05c396fc
diff --git a/trunk/drivers/scsi/qla2xxx/qla_isr.c b/trunk/drivers/scsi/qla2xxx/qla_isr.c
index 92cab5c35be5..9eb6ef333044 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_isr.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_isr.c
@@ -1060,8 +1060,9 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
 		resid = resid_len;
 		/* Use F/W calculated residual length. */
 		if (IS_FWI2_CAPABLE(ha)) {
-			if (scsi_status & SS_RESIDUAL_UNDER &&
-			    resid != fw_resid_len) {
+			if (!(scsi_status & SS_RESIDUAL_UNDER)) {
+				lscsi_status = 0;
+			} else if (resid != fw_resid_len) {
 				scsi_status &= ~SS_RESIDUAL_UNDER;
 				lscsi_status = 0;
 			}