rpms/kernel/FC-4 linux-2.6-ide-floppy-eject.patch, NONE, 1.1 kernel-2.6.spec, 1.1464, 1.1465

[fedora-cvs-commits redhat com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv3503

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ide-floppy-eject.patch 
Log Message:
* Sun Oct 02 2005 Dave Jones <davej redhat com>
- fix ide floppy eject. (#158548)


linux-2.6-ide-floppy-eject.patch:
 ide-floppy.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-ide-floppy-eject.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158548
http://www.gossamer-threads.com/lists/linux/kernel/568526


--- 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)





Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1464
retrieving revision 1.1465
diff -u -r1.1464 -r1.1465
--- kernel-2.6.spec	2 Oct 2005 23:19:55 -0000	1.1464
+++ kernel-2.6.spec	2 Oct 2005 23:25:03 -0000	1.1465
@@ -339,6 +339,7 @@
 Patch1623: linux-2.6-ide-scsi-check_condition.patch
 Patch1624: linux-2.6-usb-transcend-nosense.patch
 Patch1625: linux-2.6-net-sk98lin-vpd.patch
+Patch1626: linux-2.6-ide-floppy-eject.patch
 
 Patch1800: linux-2.6-ide-tune-locking.patch
 
@@ -780,6 +781,8 @@
 %patch1624 -p1
 # Fix sk98lin vpd problem. (#136158)
 %patch1625 -p1
+# Fix IDE floppy eject. (#158548)
+%patch1626 -p1
 
 # Fix IDE locking bug.
 %patch1800 -p1
@@ -1242,6 +1245,9 @@
 
 %changelog
 * Sun Oct 02 2005 Dave Jones <davej redhat com>
+- fix ide floppy eject. (#158548)
+
+* Sun Oct 02 2005 Dave Jones <davej redhat com>
 - Disable debug messages in w83781d sensor driver. (#169695)
 - Re-add a bunch of patches that got accidentally dropped in last update.
   - Fix suspend/resume with 8319too
@@ -1249,6 +1255,7 @@
   - Missing check condition in ide scsi (#160868)
   - Fix nosense error with transcend usb keys (#162559)
   - Fix sk98lin vpd problem. (#136158)
+- Fix IDE floppy eject. (#158548)
 
 * Fri Sep 30 2005 Dave Jones <davej redhat com>
 - irda-driver smsc-ircc2 needs pnp-functionality. (#153970)