From f7c0280c464961458c3e3ec1f64c106c0c0988ac Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de>
Date: Thu, 31 Aug 2006 21:27:41 -0700
Subject: [PATCH] --- yaml --- r: 33759 b: refs/heads/master c:
 ef16b5194f3233a11851180cd82eafb76542047d h: refs/heads/master i:   33757:
 caecec3a4b0cb79a9f91a669a6a1f6b5e55f09aa   33755:
 2b63c35b96fcaacc4803f6224edb69a7178cfd87   33751:
 2d9abd9e916c7e77dc7009754bae5f48451fdcc5   33743:
 8d69430b36cb53a725456a9a649fe7d43756f883   33727:
 651b23d9a37d9af0834e0a475a3938183d05cc06 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/block/floppy.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 08c9a9b4b240..fe01698a0147 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9aa141cfc2e08470bba3b9a8328bc50ac457488
+refs/heads/master: ef16b5194f3233a11851180cd82eafb76542047d
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 5109fa37c662..ad1d7065a1b2 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/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);