From cffd0d091a34e3493efc9da37fc385e9ac6d39ae Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 22 Dec 2006 01:08:14 -0800
Subject: [PATCH] --- yaml --- r: 44885 b: refs/heads/master c:
 9d7ac8be4b48737ad1cebd94ed754a269f360708 h: refs/heads/master i:   44883:
 da6fac242de081c50ce04537b43831dbd730ba86 v: v3

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

diff --git a/[refs] b/[refs]
index b8514872ee4e..ffdecd02fc9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e903387f1ebe3a7ddb93cd49c38341d3632df528
+refs/heads/master: 9d7ac8be4b48737ad1cebd94ed754a269f360708
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index 1c1b7125b8ac..d27b25855743 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/kernel/irq/chip.c
@@ -517,8 +517,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
 
 	if (!handle)
 		handle = handle_bad_irq;
-
-	if (desc->chip == &no_irq_chip) {
+	else if (desc->chip == &no_irq_chip) {
 		printk(KERN_WARNING "Trying to install %sinterrupt handler "
 		       "for IRQ%d\n", is_chained ? "chained " : "", irq);
 		/*