From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Mon, 15 Jun 2009 16:52:55 +0000 (+0200)
Subject: ide: call clear_irq() method in ide_timer_expiry()
X-Git-Tag: MMI-PSA29.97-13-9~27686^2~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=53b987d5e7e8d5be3b84522149907fa7ac95526e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

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