From: Chris Friesen <cfriesen@nortel.com>
Date: Mon, 20 Oct 2008 18:41:58 +0000 (-0600)
Subject: genirq: fix set_irq_type() when recording trigger type
X-Git-Tag: v2.6.28-rc1~44^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0b3682ba33c59a362901b478bdab965da888b350;p=linux-2.6-omap-h63xx.git

genirq: fix set_irq_type() when recording trigger type

Impact: fix boot hang on a G5

In set_irq_type() we want to pass the type rather than the current
interrupt state.

Signed-off-by: Chris Friesen <cfriesen@nortel.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 4895fde4eb9..3de6ea3ee74 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -127,7 +127,7 @@ int set_irq_type(unsigned int irq, unsigned int type)
 		return 0;
 
 	spin_lock_irqsave(&desc->lock, flags);
-	ret = __irq_set_trigger(desc, irq, flags);
+	ret = __irq_set_trigger(desc, irq, type);
 	spin_unlock_irqrestore(&desc->lock, flags);
 	return ret;
 }