diff options
author | Michael Schmitz <schmitz@biophys.uni-duesseldorf.de> | 2008-12-02 14:40:02 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-12-02 14:40:02 -0500 |
commit | f9e3326dce0ef117308872cd234b903aa19aa40f (patch) | |
tree | a1dff20298ac224d70198959951b0b2f9e43208f /drivers/ide/ide-io.c | |
parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) |
ide: fix the ide_release_lock imbalance
ide_release_lock() spits out lots of:
ide_release_lock: bug
warnings on Atari Falcon.
Fix the ide_release_lock imbalance.
Signed-off-by: Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 7162d67562af..0be7c4eb11c3 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -967,14 +967,13 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) | |||
967 | ide_startstop_t startstop; | 967 | ide_startstop_t startstop; |
968 | int loops = 0; | 968 | int loops = 0; |
969 | 969 | ||
970 | /* for atari only: POSSIBLY BROKEN HERE(?) */ | ||
971 | ide_get_lock(ide_intr, hwgroup); | ||
972 | |||
973 | /* caller must own ide_lock */ | 970 | /* caller must own ide_lock */ |
974 | BUG_ON(!irqs_disabled()); | 971 | BUG_ON(!irqs_disabled()); |
975 | 972 | ||
976 | while (!hwgroup->busy) { | 973 | while (!hwgroup->busy) { |
977 | hwgroup->busy = 1; | 974 | hwgroup->busy = 1; |
975 | /* for atari only */ | ||
976 | ide_get_lock(ide_intr, hwgroup); | ||
978 | drive = choose_drive(hwgroup); | 977 | drive = choose_drive(hwgroup); |
979 | if (drive == NULL) { | 978 | if (drive == NULL) { |
980 | int sleeping = 0; | 979 | int sleeping = 0; |