Skip to content

Commit

Permalink
falconide: locking bugfix
Browse files Browse the repository at this point in the history
commit 8ac4ce7 ("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 <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Feb 19, 2008
1 parent ef70916 commit d684b21
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/ide/ide-generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand All @@ -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;
}

Expand Down
2 changes: 2 additions & 0 deletions drivers/ide/legacy/falconide.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d684b21

Please sign in to comment.