---

yaml --- r: 243329 b: refs/heads/master c: 1d5f821 h: refs/heads/master i: 243327: 2b791a9 v: v3
git-mirror · Mar 29, 2011 · 44ef2a2 · 44ef2a2
1 parent 1bcb391
commit 44ef2a2
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: e4ec7989b4e55d9275ebac66230b7dac6dcb1fae
+refs/heads/master: 1d5f821c3f9f2344e1a854aa91a5ab3b25ee5c2a
diff --git a/trunk/arch/mips/vr41xx/common/irq.c b/trunk/arch/mips/vr41xx/common/irq.c
@@ -87,7 +87,7 @@ static void irq_dispatch(unsigned int irq)
 			atomic_inc(&irq_err_count);
 		else
 			irq_dispatch(irq);
-		if (!(desc->status & IRQ_DISABLED) && chip->irq_unmask)
+		if (!irqd_irq_disabled(idata) && chip->irq_unmask)
 			chip->irq_unmask(idata);
 	} else
 		do_IRQ(irq);