Skip to contentSkip to conversation

falconide: locking bugfix

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Feb 17, 2008 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 falconide: locking bugfix

commit 8ac4ce742c66100931b6f2d7a36b0df08bc721fe ("ide: fix host drivers depending on ide_generic to probe for interfaces (take 2)") moved probing to falconide but forgot to take care of Atari specific locking - fix it.

Cc Geert Uytterhoeven <[email protected]>
Cc Michael Schmitz <[email protected]>
---
 drivers/ide/ide-generic.c      |    6 ------
 drivers/ide/legacy/falconide.c |    2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)
drivers/ide/ide-generic.c +0 -6
Index: b/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;
 }
 
drivers/ide/legacy/falconide.c +2 -0
Index: b/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;