aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2009-06-15 12:52:55 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-06-15 12:52:55 -0400
commit53b987d5e7e8d5be3b84522149907fa7ac95526e (patch)
tree8e7d65cc2719f63c2ba83ea564707a4d696500df
parentccae50bcf9b8a2365e8050ccdd20b172db7b9be1 (diff)
ide: call clear_irq() method in ide_timer_expiry()
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>
-rw-r--r--drivers/ide/ide-io.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 272cc38f6dbe..c569d56eadc6 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -685,6 +685,9 @@ void ide_timer_expiry (unsigned long data)
685 hwif->dma_ops->dma_lost_irq(drive); 685 hwif->dma_ops->dma_lost_irq(drive);
686 if (hwif->ack_intr) 686 if (hwif->ack_intr)
687 hwif->ack_intr(hwif); 687 hwif->ack_intr(hwif);
688 if (hwif->port_ops && hwif->port_ops->clear_irq)
689 hwif->port_ops->clear_irq(drive);
690
688 printk(KERN_WARNING "%s: lost interrupt\n", 691 printk(KERN_WARNING "%s: lost interrupt\n",
689 drive->name); 692 drive->name);
690 startstop = handler(drive); 693 startstop = handler(drive);