---

yaml --- r: 110591 b: refs/heads/master c: 2d13693 h: refs/heads/master i: 110589: a4824ef 110587: 4675068 110583: be847e0 110575: 9188d0f 110559: bac8945 110527: 6592626 110463: f3d548a 110335: 8002d46 110079: 8578b17 109567: f2cb472 108543: b556ed9 106495: 875b556 v: v3
git-mirror · Oct 3, 2008 · 6c83fc6 · 6c83fc6
1 parent b79df57
commit 6c83fc6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 			}