From bb3a8f1b88a520cc78cd88add188e629c29f7b64 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Tue, 19 Feb 2008 01:41:25 +0100
Subject: [PATCH] --- yaml --- r: 85782 b: refs/heads/master c:
 d684b21f89b96af3adc06877f29fd9f5214b23c8 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/ide/ide-generic.c      | 6 ------
 trunk/drivers/ide/legacy/falconide.c | 2 ++
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 27b5e7d13f03..75c6493c86a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef709165d8de1ba9dd3cd5e05dbabf71dc32d883
+refs/heads/master: d684b21f89b96af3adc06877f29fd9f5214b23c8
diff --git a/trunk/drivers/ide/ide-generic.c b/trunk/drivers/ide/ide-generic.c
index 709b9e4d2871..9ebec08eefd9 100644
--- a/trunk/drivers/ide/ide-generic.c
+++ b/trunk/drivers/ide/ide-generic.c
@@ -17,9 +17,6 @@ static int __init ide_generic_init(void)
 	u8 idx[MAX_HWIFS];
 	int i;
 
-	if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
-		ide_get_lock(NULL, NULL); /* for atari only */
-
 	for (i = 0; i < MAX_HWIFS; i++) {
 		ide_hwif_t *hwif = &ide_hwifs[i];
 
@@ -31,9 +28,6 @@ static int __init ide_generic_init(void)
 
 	ide_device_add_all(idx, NULL);
 
-	if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
-		ide_release_lock();	/* for atari only */
-
 	return 0;
 }
 
diff --git a/trunk/drivers/ide/legacy/falconide.c b/trunk/drivers/ide/legacy/falconide.c
index 07bf1294a9db..8949ce71bddc 100644
--- a/trunk/drivers/ide/legacy/falconide.c
+++ b/trunk/drivers/ide/legacy/falconide.c
@@ -84,7 +84,9 @@ static int __init falconide_init(void)
 		ide_init_port_data(hwif, index);
 		ide_init_port_hw(hwif, &hw);
 
+		ide_get_lock(NULL, NULL);
 		ide_device_add(idx, NULL);
+		ide_release_lock();
 	}
 
 	return 0;