---

yaml
---
r: 101493
b: refs/heads/master
c: 427e59f
h: refs/heads/master
i:
  101491: 6e0dfe6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19c4158bcdf42ee3b2394342caf14f8471d2c78e
+refs/heads/master: 427e59f09fdba387547106de7bab980b7fff77be

trunk/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);
 }