summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 22:17:13 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 22:17:13 +0100
commitf919790f8c929ab1b392ad1a0c2e1b53337b5071 (patch)
tree3b81af4512e5e4232af74f1bb1df6ede9a19a5fb /drivers/ide/ide-io.c
parentcd3dbc99da337f2130f3cb2691fbb65c8bf22337 (diff)
downloadblackbird-op-linux-f919790f8c929ab1b392ad1a0c2e1b53337b5071.tar.gz
blackbird-op-linux-f919790f8c929ab1b392ad1a0c2e1b53337b5071.zip
ide: remove SELECT_INTERRUPT()
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r--drivers/ide/ide-io.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 1ed7a8627cca..6b70ab9566d9 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1201,7 +1201,10 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
hwif != hwgroup->hwif &&
hwif->io_ports[IDE_CONTROL_OFFSET]) {
/* set nIEN for previous hwif */
- SELECT_INTERRUPT(drive);
+ if (hwif->intrproc)
+ hwif->intrproc(drive);
+ else
+ hwif->OUTB(drive->ctl | 2, IDE_CONTROL_REG);
}
hwgroup->hwif = hwif;
hwgroup->drive = drive;
OpenPOWER on IntegriCloud