1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index c948a5c17a5d..9ae60a7400a2 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1049,9 +1049,13 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
         unsigned long flags;
         ide_driver_t *drv;
         void __user *p = (void __user *)arg;
-        int err = 0, (*setfunc)(ide_drive_t *, int);
+        int err, (*setfunc)(ide_drive_t *, int);
         u8 *val;
 
+        err = scsi_cmd_ioctl(file, bdev->bd_disk, cmd, p);
+        if (err != -ENOTTY)
+                return err;
+
         switch (cmd) {
         case HDIO_GET_32BIT:        val = &drive->io_32bit;      goto read_val;
         case HDIO_GET_KEEPSETTINGS: val = &drive->keep_settings; goto read_val;
@@ -1171,10 +1175,6 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                         return 0;
                 }
 
-                case CDROMEJECT:
-                case CDROMCLOSETRAY:
-                        return scsi_cmd_ioctl(file, bdev->bd_disk, cmd, p);
-
                 case HDIO_GET_BUSSTATE:
                         if (!capable(CAP_SYS_ADMIN))
                                 return -EACCES;