From d54f7d99158264b15af547774b96880af08d08c4 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 21 Feb 2011 12:54:34 +0100
Subject: [PATCH] --- yaml --- r: 234762 b: refs/heads/master c:
 a61d825808a0ce9935afebc225dcd602d5339e14 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/irq/chip.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3ce910bdba99..17e377cedb9e 100644
--- 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
index 1d3e25e68b0c..b5145654855f 100644
--- 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