Messages in this thread Patch in this message | | | From | Sebastian Frias <> | Subject | [PATCH] irqdomain: fix irq_domain_xlate_onetwocell() | Date | Tue, 2 Aug 2016 10:52:45 +0200 |
| |
Use IRQ_TYPE_SENSE_MASK on 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, and as a matter of fact it is used in irq_domain_xlate_twocell(), use it for irq_domain_xlate_onetwocell() as well.
Fixes: 16b2e6e2f31d ("irq_domain: Create common xlate functions that device drivers can use")
Signed-off-by: Sebastian Frias <sf84@laposte.net> --- kernel/irq/irqdomain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 8798b6c..1bdd3fe 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -824,7 +824,10 @@ int irq_domain_xlate_onetwocell(struct irq_domain *d, if (WARN_ON(intsize < 1)) return -EINVAL; *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; } EXPORT_SYMBOL_GPL(irq_domain_xlate_onetwocell); -- 1.7.11.2
| |