mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
[PATCH] ide-floppy: software eject not working with LS-120 drive
The problem (eject not working on ATAPI LS-120 drive) is caused by idefloppy_ioctl() function which *first* tries generic_ide_ioctl() and *only* if it fails with -EINVAL, proceeds with the specific ioctls. The generic eject command fails with something other than -EINVAL and the specific one is never executed. This patch fixes it by first going through the internal ioctls and only trying generic_ide_ioctl() if none of them matches. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
d868dd19ad
commit
07203f6471
1 changed files with 2 additions and 4 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue