Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d684b21f89b96af3adc06877f29fd9f5214b23c8
Commit:     d684b21f89b96af3adc06877f29fd9f5214b23c8
Parent:     ef709165d8de1ba9dd3cd5e05dbabf71dc32d883
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 19 01:41:25 2008 +0100
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Tue Feb 19 01:41:25 2008 +0100

    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]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/ide-generic.c      |    6 ------
 drivers/ide/legacy/falconide.c |    2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 709b9e4..9ebec08 100644
--- a/drivers/ide/ide-generic.c
+++ 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;
 }
 
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 07bf129..8949ce7 100644
--- a/drivers/ide/legacy/falconide.c
+++ 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to