diff options
author | Olaf Hering <olaf@aepfle.de> | 2006-09-01 00:27:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-01 14:39:08 -0400 |
commit | ef16b5194f3233a11851180cd82eafb76542047d (patch) | |
tree | 2c9cf994951b5d539f5dce21aaf93f83c0ba17d3 /drivers | |
parent | a9aa141cfc2e08470bba3b9a8328bc50ac457488 (diff) |
[PATCH] exit early in floppy_init when no floppy exists
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@aepfle.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/floppy.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 5109fa37c662..ad1d7065a1b2 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -4177,6 +4177,11 @@ static int __init floppy_init(void) | |||
4177 | int i, unit, drive; | 4177 | int i, unit, drive; |
4178 | int err, dr; | 4178 | int err, dr; |
4179 | 4179 | ||
4180 | #if defined(CONFIG_PPC_MERGE) | ||
4181 | if (check_legacy_ioport(FDC1)) | ||
4182 | return -ENODEV; | ||
4183 | #endif | ||
4184 | |||
4180 | raw_cmd = NULL; | 4185 | raw_cmd = NULL; |
4181 | 4186 | ||
4182 | for (dr = 0; dr < N_DRIVE; dr++) { | 4187 | for (dr = 0; dr < N_DRIVE; dr++) { |
@@ -4234,13 +4239,6 @@ static int __init floppy_init(void) | |||
4234 | } | 4239 | } |
4235 | 4240 | ||
4236 | use_virtual_dma = can_use_virtual_dma & 1; | 4241 | use_virtual_dma = can_use_virtual_dma & 1; |
4237 | #if defined(CONFIG_PPC_MERGE) | ||
4238 | if (check_legacy_ioport(FDC1)) { | ||
4239 | del_timer(&fd_timeout); | ||
4240 | err = -ENODEV; | ||
4241 | goto out_unreg_region; | ||
4242 | } | ||
4243 | #endif | ||
4244 | fdc_state[0].address = FDC1; | 4242 | fdc_state[0].address = FDC1; |
4245 | if (fdc_state[0].address == -1) { | 4243 | if (fdc_state[0].address == -1) { |
4246 | del_timer(&fd_timeout); | 4244 | del_timer(&fd_timeout); |