The patch titled
exit early in floppy_init when no floppy exists
has been removed from the -mm tree. Its filename is
exit-early-in-floppy_init-when-no-floppy-exists.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: exit early in floppy_init when no floppy exists
From: Olaf Hering <olaf@xxxxxxxxx>
modprobe -v floppy on a Apple G5 writes incorrect stuff to dmesg:
Floppy drive(s): fd0 is 2.88M
The reason is that the legacy io check happens very late,
when part of the floppy stuff is already initialized.
check_legacy_ioport() returns either -ENODEV right away, or it walks
the device-tree looking for a floppy node.
Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/block/floppy.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff -puN drivers/block/floppy.c~exit-early-in-floppy_init-when-no-floppy-exists drivers/block/floppy.c
--- a/drivers/block/floppy.c~exit-early-in-floppy_init-when-no-floppy-exists
+++ a/drivers/block/floppy.c
@@ -4177,6 +4177,11 @@ static int __init floppy_init(void)
int i, unit, drive;
int err, dr;
+#if defined(CONFIG_PPC_MERGE)
+ if (check_legacy_ioport(FDC1))
+ return -ENODEV;
+#endif
+
raw_cmd = NULL;
for (dr = 0; dr < N_DRIVE; dr++) {
@@ -4234,13 +4239,6 @@ static int __init floppy_init(void)
}
use_virtual_dma = can_use_virtual_dma & 1;
-#if defined(CONFIG_PPC_MERGE)
- if (check_legacy_ioport(FDC1)) {
- del_timer(&fd_timeout);
- err = -ENODEV;
- goto out_unreg_region;
- }
-#endif
fdc_state[0].address = FDC1;
if (fdc_state[0].address == -1) {
del_timer(&fd_timeout);
_
Patches currently in -mm which might be from olaf@xxxxxxxxx are
origin.patch
git-powerpc.patch
--
VGER BF report: U 0.534444
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
