From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Thu, 13 Nov 2008 09:00:03 +0000 (+0300)
Subject: ACPI: EC: count interrupts only if called from interrupt handler.
X-Git-Tag: v2.6.28-rc7~55^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7b4d469228a92a00e412675817cedd60133de38a;p=linux-2.6-omap-h63xx.git

ACPI: EC: count interrupts only if called from interrupt handler.

fix 2.6.28 EC interrupt storm regression

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index cf41f9fc24a..30f3ef236ec 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -219,7 +219,8 @@ static void gpe_transaction(struct acpi_ec *ec, u8 status)
 	goto unlock;
 err:
 	/* false interrupt, state didn't change */
-	++ec->curr->irq_count;
+	if (in_interrupt())
+		++ec->curr->irq_count;
 unlock:
 	spin_unlock_irqrestore(&ec->curr_lock, flags);
 }