Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[cascardo/linux.git] / drivers / scsi / scsi_debug.c

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 2f1f9b0..7b31093 100644 (file)
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -1805,6 +1805,7 @@ static int resp_read(struct scsi_cmnd *SCpnt, unsigned long long lba,
                        devip->sense_buff[5] = (ret >> 8) & 0xff;
                        devip->sense_buff[6] = ret & 0xff;
                }
+               scsi_set_resid(SCpnt, scsi_bufflen(SCpnt));
                return check_condition_result;
        }