genirq: fix set_irq_type() when recording trigger type
authorChris Friesen <cfriesen@nortel.com>
Mon, 20 Oct 2008 18:41:58 +0000 (12:41 -0600)
committerIngo Molnar <mingo@elte.hu>
Tue, 21 Oct 2008 08:10:08 +0000 (10:10 +0200)
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>
kernel/irq/chip.c

index 4895fde4eb933c25fe50fbbfabc3fb0a6cd9c742..3de6ea3ee7403af33371f924dfa46229cf702bc9 100644 (file)
@@ -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;
 }