[resend] [patch] ide-floppy - software eject not working with LS-120 drive

[Ondrej Zary <linux@rainbow-software.org>]

[-- Attachment #1: Type: text/plain, Size: 571 bytes --]

This is a resend because I didn't get any reply before.

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>

-- 
Ondrej Zary

[-- Attachment #2: ide-floppy-eject.patch --]
[-- Type: text/plain, Size: 799 bytes --]

--- linux-2.6.13-orig/drivers/ide/ide-floppy.c	2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13-pentium/drivers/ide/ide-floppy.c	2005-09-04 14:07:53.000000000 +0200
@@ -2038,11 +2038,9 @@
 	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 @@
 	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)