diff options
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 6 |
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, | |||
2038 | struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk); | 2038 | struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk); |
2039 | ide_drive_t *drive = floppy->drive; | 2039 | ide_drive_t *drive = floppy->drive; |
2040 | void __user *argp = (void __user *)arg; | 2040 | void __user *argp = (void __user *)arg; |
2041 | int err = generic_ide_ioctl(drive, file, bdev, cmd, arg); | 2041 | int err; |
2042 | int prevent = (arg) ? 1 : 0; | 2042 | int prevent = (arg) ? 1 : 0; |
2043 | idefloppy_pc_t pc; | 2043 | idefloppy_pc_t pc; |
2044 | if (err != -EINVAL) | ||
2045 | return err; | ||
2046 | 2044 | ||
2047 | switch (cmd) { | 2045 | switch (cmd) { |
2048 | case CDROMEJECT: | 2046 | case CDROMEJECT: |
@@ -2094,7 +2092,7 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, | |||
2094 | case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS: | 2092 | case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS: |
2095 | return idefloppy_get_format_progress(drive, argp); | 2093 | return idefloppy_get_format_progress(drive, argp); |
2096 | } | 2094 | } |
2097 | return -EINVAL; | 2095 | return generic_ide_ioctl(drive, file, bdev, cmd, arg); |
2098 | } | 2096 | } |
2099 | 2097 | ||
2100 | static int idefloppy_media_changed(struct gendisk *disk) | 2098 | static int idefloppy_media_changed(struct gendisk *disk) |