diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /drivers/scsi/sr_ioctl.c | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'drivers/scsi/sr_ioctl.c')
| -rw-r--r-- | drivers/scsi/sr_ioctl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c index 628d39c3e..265c7d04f 100644 --- a/drivers/scsi/sr_ioctl.c +++ b/drivers/scsi/sr_ioctl.c @@ -12,7 +12,6 @@ #include <scsi/scsi_ioctl.h> #include <linux/cdrom.h> -#include <linux/ucdrom.h> #include "sr.h" #if 0 @@ -729,7 +728,7 @@ int sr_dev_ioctl(struct cdrom_device_info *cdi, return -ENOMEM; lba = (((msf.cdmsf_min0 * CD_SECS) + msf.cdmsf_sec0) - * CD_FRAMES + msf.cdmsf_frame0) - CD_BLOCK_OFFSET; + * CD_FRAMES + msf.cdmsf_frame0) - CD_MSF_OFFSET; if (lba < 0 || lba >= scsi_CDs[target].capacity) return -EINVAL; @@ -757,7 +756,7 @@ int sr_dev_ioctl(struct cdrom_device_info *cdi, lba = ra.addr.lba; else lba = (((ra.addr.msf.minute * CD_SECS) + ra.addr.msf.second) - * CD_FRAMES + ra.addr.msf.frame) - CD_BLOCK_OFFSET; + * CD_FRAMES + ra.addr.msf.frame) - CD_MSF_OFFSET; if (lba < 0 || lba >= scsi_CDs[target].capacity) return -EINVAL; |