diff options
| author | Chris Friesen <cfriesen@nortel.com> | 2008-10-20 12:41:58 -0600 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-21 10:10:08 +0200 |
| commit | 0b3682ba33c59a362901b478bdab965da888b350 (patch) | |
| tree | 652dd572a96881874c63db246b86ed6e4fbdec48 /kernel/irq | |
| parent | a9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da (diff) | |
| download | linux-0b3682ba33c59a362901b478bdab965da888b350.tar.gz linux-0b3682ba33c59a362901b478bdab965da888b350.tar.bz2 linux-0b3682ba33c59a362901b478bdab965da888b350.zip | |
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/irq')
| -rw-r--r-- | kernel/irq/chip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 4895fde4eb93..3de6ea3ee740 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; } |