[PATCH 1/6] ide: fix setting nIEN on idle devices

Bartlomiej Zolnierkiewicz
2008-12-13T23:40:50Z

Subject: [PATCH] ide: fix setting nIEN on idle devices

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>
---
all patches are for pata-2.6 tree

drivers/ide/ide-io.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

Index: b/drivers/ide/ide-io.c
===================================================================
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -724,7 +724,9 @@ void do_ide_request(struct request_queue
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) {
@@ -734,13 +736,13 @@ repeat:
}
}

- 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;