Skip to content

Commit

Permalink
ide: fix setting nIEN on idle devices
Browse files Browse the repository at this point in the history
Fix do_ide_request() to operate on previous device / port instead of
the current one.  The original code was wrong since at least Feb 2002
(2.4.0 timeframe).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jan 6, 2009
1 parent b46f205 commit 42cf261
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/ide/ide-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,9 @@ void do_ide_request(struct request_queue *q)
spin_lock_irq(&hwgroup->lock);

if (!ide_lock_hwgroup(hwgroup)) {
ide_hwif_t *prev_port;
repeat:
prev_port = hwgroup->hwif;
hwgroup->rq = NULL;

if (drive->dev_flags & IDE_DFLAG_SLEEPING) {
Expand All @@ -734,13 +736,13 @@ void do_ide_request(struct request_queue *q)
}
}

if (hwif != hwgroup->hwif) {
if (hwif != prev_port) {
/*
* set nIEN for previous hwif, drives in the
* set nIEN for previous port, drives in the
* quirk_list may not like intr setups/cleanups
*/
if (drive->quirk_list == 0)
hwif->tp_ops->set_irq(hwif, 0);
if (hwgroup->drive->quirk_list == 0)
prev_port->tp_ops->set_irq(prev_port, 0);
}
hwgroup->hwif = hwif;
hwgroup->drive = drive;
Expand Down

0 comments on commit 42cf261

Please sign in to comment.