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.27.8~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bcd48fbb5a26632fea79ff62f63d3f67bf67f1ac;p=karo-tx-linux.git

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

commit 7b4d469228a92a00e412675817cedd60133de38a upstream.

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>
Cc: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 41b8e7cad06e..9ab3fb941025 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);
 }