Commit 0c228919 authored by Sebastian Frias's avatar Sebastian Frias Committed by Thomas Gleixner

irqdomain: Mask irq type in irq_domain_xlate_onetwocell()

According to the xlate() callback definition, the 'out_type' parameter
needs to be the "linux irq type".

A mask for such bits exists, IRQ_TYPE_SENSE_MASK, which is correctly
applied in irq_domain_xlate_twocell()

So use it for irq_domain_xlate_onetwocell() as well.
Signed-off-by: default avatarSebastian Frias <sf84@laposte.net>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Mason <slash.tmp@free.fr>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/57A05F5D.103@laposte.netSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ee26c013
...@@ -868,7 +868,10 @@ int irq_domain_xlate_onetwocell(struct irq_domain *d, ...@@ -868,7 +868,10 @@ int irq_domain_xlate_onetwocell(struct irq_domain *d,
if (WARN_ON(intsize < 1)) if (WARN_ON(intsize < 1))
return -EINVAL; return -EINVAL;
*out_hwirq = intspec[0]; *out_hwirq = intspec[0];
*out_type = (intsize > 1) ? intspec[1] : IRQ_TYPE_NONE; if (intsize > 1)
*out_type = intspec[1] & IRQ_TYPE_SENSE_MASK;
else
*out_type = IRQ_TYPE_NONE;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(irq_domain_xlate_onetwocell); EXPORT_SYMBOL_GPL(irq_domain_xlate_onetwocell);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment