diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-24 21:41:57 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-24 23:17:56 +0100 |
| commit | 07611dbda5ccbd9a628f29686d62bafdd007db7b (patch) | |
| tree | 7c5ba2b8291fa9505513f726b57b6d4ca439df42 /arch/x86/kernel | |
| parent | 00a30b254b88d2d4f5af00835a9b7f70326def9b (diff) | |
| download | kernel_samsung_tuna-07611dbda5ccbd9a628f29686d62bafdd007db7b.zip kernel_samsung_tuna-07611dbda5ccbd9a628f29686d62bafdd007db7b.tar.gz kernel_samsung_tuna-07611dbda5ccbd9a628f29686d62bafdd007db7b.tar.bz2 | |
x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional
That call escaped the name space cleanup. Fix it up.
We really want to call there. The chip might have changed since the
irq was setup initially. So let the core code and the chip decide what
to do. The status is just an unreliable snapshot.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/devicetree.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 9c91bad..706a9fb 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -68,9 +68,7 @@ unsigned int irq_create_of_mapping(struct device_node *controller, return 0; if (type == IRQ_TYPE_NONE) return virq; - /* set the mask if it is different from current */ - if (type == (irq_to_desc(virq)->status & IRQF_TRIGGER_MASK)) - set_irq_type(virq, type); + irq_set_irq_type(virq, type); return virq; } EXPORT_SYMBOL_GPL(irq_create_of_mapping); |