diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /drivers/scsi/sr.c | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 7c80711e18ed..ebf6579ed698 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -217,7 +217,7 @@ int sr_media_change(struct cdrom_device_info *cdi, int slot) | |||
| 217 | static void rw_intr(struct scsi_cmnd * SCpnt) | 217 | static void rw_intr(struct scsi_cmnd * SCpnt) |
| 218 | { | 218 | { |
| 219 | int result = SCpnt->result; | 219 | int result = SCpnt->result; |
| 220 | int this_count = SCpnt->bufflen; | 220 | int this_count = SCpnt->request_bufflen; |
| 221 | int good_bytes = (result == 0 ? this_count : 0); | 221 | int good_bytes = (result == 0 ? this_count : 0); |
| 222 | int block_sectors = 0; | 222 | int block_sectors = 0; |
| 223 | long error_sector; | 223 | long error_sector; |