---

yaml --- r: 234712 b: refs/heads/master c: d78f8dd h: refs/heads/master v: v3
git-mirror · Feb 19, 2011 · 9edee83 · 9edee83
1 parent d8f5037
commit 9edee83
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aae994fb0f43f6d94a31c33536a83869504abdf
+refs/heads/master: d78f8dd36b90626106ce19cb2e6828b0dc39447e
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
@@ -611,7 +611,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 	if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||
 		    !desc->action)) {
 		if (!irq_check_poll(desc)) {
-			desc->status |= (IRQ_PENDING | IRQ_MASKED);
+			desc->status |= IRQ_PENDING;
 			mask_ack_irq(desc);
 			goto out_unlock;
 		}