ide: call clear_irq() method in ide_timer_expiry()
authorSergei Shtylyov <sshtylyov@ru.mvista.com>
Mon, 15 Jun 2009 16:52:55 +0000 (18:52 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Mon, 15 Jun 2009 16:52:55 +0000 (18:52 +0200)
Now the clear_irq() method is called only from ide_intr() but ide_timer_expiry()
also should call this method in case when drive_is_ready() succeeds...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-io.c

index 272cc38f6dbe55192283db6ea2902e3d576b6a26..c569d56eadc6f620e5cb4f690aec38797e3e95e7 100644 (file)
@@ -685,6 +685,9 @@ void ide_timer_expiry (unsigned long data)
                                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);