Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index e83f54d37f96..f615ab759962 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -2038,11 +2038,9 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file,
         struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk);
         ide_drive_t *drive = floppy->drive;
         void __user *argp = (void __user *)arg;
-        int err = generic_ide_ioctl(drive, file, bdev, cmd, arg);
+        int err;
         int prevent = (arg) ? 1 : 0;
         idefloppy_pc_t pc;
-        if (err != -EINVAL)
-                return err;
 
         switch (cmd) {
         case CDROMEJECT:
@@ -2094,7 +2092,7 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file,
         case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:
                 return idefloppy_get_format_progress(drive, argp);
         }
-        return -EINVAL;
+        return generic_ide_ioctl(drive, file, bdev, cmd, arg);
 }
 
 static int idefloppy_media_changed(struct gendisk *disk)