From ba180890a9965dc9520fbe3e14bc05d5177bb49f Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 24 Mar 2011 21:41:57 +0100 Subject: [PATCH] --- yaml --- r: 242502 b: refs/heads/master c: 07611dbda5ccbd9a628f29686d62bafdd007db7b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/devicetree.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f47e579ec35e..3ac7483c3a1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00a30b254b88d2d4f5af00835a9b7f70326def9b +refs/heads/master: 07611dbda5ccbd9a628f29686d62bafdd007db7b diff --git a/trunk/arch/x86/kernel/devicetree.c b/trunk/arch/x86/kernel/devicetree.c index 9c91badb6ca9..706a9fb46a58 100644 --- a/trunk/arch/x86/kernel/devicetree.c +++ b/trunk/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);