1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 272cc38f6dbe..1059f809b809 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -683,8 +683,9 @@ void ide_timer_expiry (unsigned long data)
                 } else if (drive_is_ready(drive)) {
                         if (drive->waiting_for_dma)
                                 hwif->dma_ops->dma_lost_irq(drive);
-                        if (hwif->ack_intr)
-                                hwif->ack_intr(hwif);
+                        if (hwif->port_ops && hwif->port_ops->clear_irq)
+                                hwif->port_ops->clear_irq(drive);
+
                         printk(KERN_WARNING "%s: lost interrupt\n",
                                 drive->name);
                         startstop = handler(drive);
@@ -803,7 +804,8 @@ irqreturn_t ide_intr (int irq, void *dev_id)
 
         spin_lock_irqsave(&hwif->lock, flags);
 
-        if (hwif->ack_intr && hwif->ack_intr(hwif) == 0)
+        if (hwif->port_ops && hwif->port_ops->test_irq &&
+            hwif->port_ops->test_irq(hwif) == 0)
                 goto out;
 
         handler = hwif->handler;