diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-25 15:27:14 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 15:27:14 -0500 |
| commit | 02fa9f0451ac639a687bfc145eefe58703ff220e (patch) | |
| tree | fe984acc78f22f6eb8fb98efaba8b1ac2f3ad8d9 /drivers/scsi/scsi_debug.c | |
| parent | cbc9438075ca9dee3f39a2e7310f81c304b40359 (diff) | |
| parent | 51c404b2c514930e98e81e0b9294f19892a4f871 (diff) | |
Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
Diffstat (limited to 'drivers/scsi/scsi_debug.c')
| -rw-r--r-- | drivers/scsi/scsi_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 7b310934efed..a6b2d72022fc 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c | |||
| @@ -1671,7 +1671,7 @@ static int do_device_access(struct scsi_cmnd *scmd, | |||
| 1671 | unsigned long long lba, unsigned int num, int write) | 1671 | unsigned long long lba, unsigned int num, int write) |
| 1672 | { | 1672 | { |
| 1673 | int ret; | 1673 | int ret; |
| 1674 | unsigned int block, rest = 0; | 1674 | unsigned long long block, rest = 0; |
| 1675 | int (*func)(struct scsi_cmnd *, unsigned char *, int); | 1675 | int (*func)(struct scsi_cmnd *, unsigned char *, int); |
| 1676 | 1676 | ||
| 1677 | func = write ? fetch_to_dev_buffer : fill_from_dev_buffer; | 1677 | func = write ? fetch_to_dev_buffer : fill_from_dev_buffer; |