diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 17:51:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 17:51:51 -0700 |
| commit | 26ff6801f751cd47e44c2e9507ec08b447f2d2b9 (patch) | |
| tree | a6bd5286e4a1ab4f96847300cb8d961ada62a231 /arch/x86/kernel/devicetree.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu (diff) | |
| parent | x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional (diff) | |
| download | wireguard-linux-26ff6801f751cd47e44c2e9507ec08b447f2d2b9.tar.xz wireguard-linux-26ff6801f751cd47e44c2e9507ec08b447f2d2b9.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional
x86: DT: Fix return condition in irq_create_of_mapping()
x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/kernel/devicetree.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 7a8cebc9ff29..706a9fb46a58 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -65,12 +65,10 @@ unsigned int irq_create_of_mapping(struct device_node *controller, return 0; ret = ih->xlate(ih, intspec, intsize, &virq, &type); if (ret) - return ret; + 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); |