---

yaml --- r: 336665 b: refs/heads/master c: a3cd8d2 h: refs/heads/master i: 336663: fb63829 v: v3
git-mirror · Nov 14, 2012 · 1f13443 · 1f13443
1 parent d97b5c4
commit 1f13443
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b76b51ba0cef13980813373a548a12206e3cd3c9
+refs/heads/master: a3cd8d2789c2e265e09377f260e7d2ac9cec81bb
diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c
@@ -198,9 +198,13 @@ static void advance_transaction(struct acpi_ec *ec, u8 status)
 		t->done = true;
 	goto unlock;
 err:
-	/* false interrupt, state didn't change */
-	if (in_interrupt())
+	/*
+	 * If SCI bit is set, then don't think it's a false IRQ
+	 * otherwise will take a not handled IRQ as a false one.
+	 */
+	if (in_interrupt() && !(status & ACPI_EC_FLAG_SCI))
 		++t->irq_count;
+
 unlock:
 	spin_unlock_irqrestore(&ec->lock, flags);
 }