diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-17 21:02:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-17 21:02:57 -0700 |
| commit | d103bdbf34d5ab76a92fc0d1a4aae7b1af5c8493 (patch) | |
| tree | 06a02f574b4a3fc284d036a319271eac3be40a47 /drivers/cdrom | |
| parent | c055ad89ad3cd9e2a0da51307212517226a929f7 (diff) | |
| parent | 0aa8a47e7eb0ec3e23fcb27c7eac5e4d9dcf3ef9 (diff) | |
Merge Al/Jens clashes
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/cdrom.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index ee0ff76e153c..a4f52acc1e9e 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -267,6 +267,7 @@ #include <linux/blkpg.h> #include <linux/init.h> #include <linux/fcntl.h> +#include <linux/blkdev.h> #include <asm/uaccess.h> @@ -1436,6 +1437,11 @@ int cdrom_ioctl(struct cdrom_device_info *cdi, struct inode *ip, struct cdrom_device_ops *cdo = cdi->ops; int ret; + /* Try the generic SCSI command ioctl's first.. */ + ret = scsi_cmd_ioctl(ip->i_bdev, cmd, arg); + if (ret != -ENOTTY) + return ret; + /* the first few commands do not deal with audio drive_info, but only with routines in cdrom device operations. */ switch (cmd) { |