diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-10 17:23:41 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-10 17:23:41 -0500 |
| commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
| tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /drivers/scsi/scsi_debug.c | |
| parent | 1740d483ba4d79f9fa6984dccd7152b6b208f1bf (diff) | |
| parent | d7cd5c73cec2dfa9f259a2adcf802c9f8fcc125f (diff) | |
Merge branch 'ehci-omap-clock' into omap-fixes
Diffstat (limited to 'drivers/scsi/scsi_debug.c')
| -rw-r--r-- | drivers/scsi/scsi_debug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 2f1f9b079b10..7b310934efed 100644 --- 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, | |||
| 1805 | devip->sense_buff[5] = (ret >> 8) & 0xff; | 1805 | devip->sense_buff[5] = (ret >> 8) & 0xff; |
| 1806 | devip->sense_buff[6] = ret & 0xff; | 1806 | devip->sense_buff[6] = ret & 0xff; |
| 1807 | } | 1807 | } |
| 1808 | scsi_set_resid(SCpnt, scsi_bufflen(SCpnt)); | ||
| 1808 | return check_condition_result; | 1809 | return check_condition_result; |
| 1809 | } | 1810 | } |
| 1810 | 1811 | ||