X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Facpi%2Fec.c;h=30f3ef236ecb1b354548c5bb2570866eaa8ec6be;hb=6a1214113090905aca6a492fc8ef10d84c608a69;hp=cf41f9fc24a73fed7d7bd0799f654050609ef128;hpb=45a9524a61267a60aef3c273b97284e93b15f4d7;p=linux-2.6-omap-h63xx.git

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