---

yaml --- r: 31083 b: refs/heads/master c: 98bb244 h: refs/heads/master i: 31081: 21c10fe 31079: e468bb6 v: v3
git-mirror · Jun 29, 2006 · b4d3bd5 · b4d3bd5
1 parent adffe91
commit b4d3bd5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f210be198ddd3f54b17d4aa6e69b829f75f226e5
+refs/heads/master: 98bb244b685eb2a297aa60fa2e5c0631f95828e1
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
@@ -311,10 +311,13 @@ handle_fastack_irq(unsigned int irq, struct irq_desc *desc,
 	 * keep it masked and get out of here
 	 */
 	action = desc->action;
-	if (unlikely(!action || (desc->status & IRQ_DISABLED)))
+	if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
+		desc->status |= IRQ_PENDING;
 		goto out;
+	}
 
 	desc->status |= IRQ_INPROGRESS;
+	desc->status &= ~IRQ_PENDING;
 	spin_unlock(&desc->lock);
 
 	action_ret = handle_IRQ_event(irq, regs, action);