---

yaml --- r: 234762 b: refs/heads/master c: a61d825 h: refs/heads/master v: v3
git-mirror · Feb 21, 2011 · d54f7d9 · d54f7d9
1 parent 72742fa
commit d54f7d9
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: a439520f8b18917b322f576be04c54aba84bb044
+refs/heads/master: a61d825808a0ce9935afebc225dcd602d5339e14
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
@@ -199,8 +199,8 @@ void irq_disable(struct irq_desc *desc)
 	irq_state_set_disabled(desc);
 	if (desc->irq_data.chip->irq_disable) {
 		desc->irq_data.chip->irq_disable(&desc->irq_data);
+		irq_state_set_masked(desc);
 	}
-	irq_state_set_masked(desc);
 }
 
 #ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED