From f6b83e8773815020a1002b20a7afe6c1a3ad1fbe Mon Sep 17 00:00:00 2001
From: Pete Wyckoff <pw@osc.edu>
Date: Tue, 13 Mar 2007 16:53:28 -0400
Subject: [PATCH] --- yaml --- r: 53644 b: refs/heads/master c:
 b22f687dd28a7a8886b918294b4d558ef175c07d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8004c8f0de3c..b3d14659ec1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a52decafbe3fdca5e8430d4f58ffcec1f4a6302c
+refs/heads/master: b22f687dd28a7a8886b918294b4d558ef175c07d
diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c
index 5f955707d902..be8e6558b89e 100644
--- a/trunk/drivers/scsi/scsi_lib.c
+++ b/trunk/drivers/scsi/scsi_lib.c
@@ -848,8 +848,8 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
 				memcpy(req->sense, cmd->sense_buffer,  len);
 				req->sense_len = len;
 			}
-		} else
-			req->data_len = cmd->resid;
+		}
+		req->data_len = cmd->resid;
 	}
 
 	/*