Pull misc into release branch

[~andy/linux] / drivers / cdrom / cdrom.c

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index aa5468f487ba3d9e55172a52587a5257d85d2e48..499019bf8f40f6bd8a97218bb7116352f686b481 100644 (file)
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2695,11 +2695,12 @@ int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi,
 {
        void __user *argp = (void __user *)arg;
        int ret;
+       struct gendisk *disk = ip->i_bdev->bd_disk;
 
        /*
         * Try the generic SCSI command ioctl's first.
         */
-       ret = scsi_cmd_ioctl(file, ip->i_bdev->bd_disk, cmd, argp);
+       ret = scsi_cmd_ioctl(file, disk->queue, disk, cmd, argp);
        if (ret != -ENOTTY)
                return ret;