Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 110e776d1a07..36c92f961e15 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -855,9 +855,18 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
 
         good_bytes = scsi_bufflen(cmd);
         if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
+                int old_good_bytes = good_bytes;
                 drv = scsi_cmd_to_driver(cmd);
                 if (drv->done)
                         good_bytes = drv->done(cmd);
+                /*
+                 * USB may not give sense identifying bad sector and
+                 * simply return a residue instead, so subtract off the
+                 * residue if drv->done() error processing indicates no
+                 * change to the completion length.
+                 */
+                if (good_bytes == old_good_bytes)
+                        good_bytes -= scsi_get_resid(cmd);
         }
         scsi_io_completion(cmd, good_bytes);
 }