aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorChris Friesen <cfriesen@nortel.com>2008-10-20 12:41:58 -0600
committerIngo Molnar <mingo@elte.hu>2008-10-21 10:10:08 +0200
commit0b3682ba33c59a362901b478bdab965da888b350 (patch)
tree652dd572a96881874c63db246b86ed6e4fbdec48 /kernel
parenta9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da (diff)
downloadlinux-linaro-0b3682ba33c59a362901b478bdab965da888b350.tar.gz
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/chip.c2
1 files changed, 1 insertions, 1 deletions
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;
}