From 1db03d722c939ed05ee6f0d1a12bad12dc4dc236 Mon Sep 17 00:00:00 2001
From: David Somayajulu <david.somayajulu@qlogic.com>
Date: Thu, 21 Feb 2008 03:43:00 -0800
Subject: [PATCH] --- yaml --- r: 86188 b: refs/heads/master c:
 65fecc77f3c47c5e8758d133b8ec47dcc16ed207 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/qla4xxx/ql4_isr.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 81c0414a418b..60cf70e74576 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8e14fec164cc01d8dfb18760ee9bddd91e127c2
+refs/heads/master: 65fecc77f3c47c5e8758d133b8ec47dcc16ed207
diff --git a/trunk/drivers/scsi/qla4xxx/ql4_isr.c b/trunk/drivers/scsi/qla4xxx/ql4_isr.c
index 0f029d0d7315..fc84db4069f4 100644
--- a/trunk/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/trunk/drivers/scsi/qla4xxx/ql4_isr.c
@@ -100,8 +100,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
 
 		if (sts_entry->iscsiFlags &ISCSI_FLAG_RESIDUAL_UNDER) {
 			scsi_set_resid(cmd, residual);
-			if (!scsi_status && ((scsi_bufflen(cmd) - residual) <
-				cmd->underflow)) {
+			if ((scsi_bufflen(cmd) - residual) < cmd->underflow) {
 
 				cmd->result = DID_ERROR << 16;