[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-0c228919e04ddec195402296e7ebf2472ed6caef@git.kernel.org>
Date: Fri, 2 Sep 2016 09:15:01 -0700
From: tip-bot for Sebastian Frias <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tglx@...utronix.de, linux-kernel@...r.kernel.org, mingo@...nel.org,
sf84@...oste.net, marc.zyngier@....com, jason@...edaemon.net,
hpa@...or.com, grant.likely@...retlab.ca, slash.tmp@...e.fr
Subject: [tip:irq/core] irqdomain: Mask irq type in
irq_domain_xlate_onetwocell()
Commit-ID: 0c228919e04ddec195402296e7ebf2472ed6caef
Gitweb: http://git.kernel.org/tip/0c228919e04ddec195402296e7ebf2472ed6caef
Author: Sebastian Frias <sf84@...oste.net>
AuthorDate: Tue, 2 Aug 2016 10:52:45 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 2 Sep 2016 18:06:50 +0200
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: Sebastian Frias <sf84@...oste.net>
Cc: Grant Likely <grant.likely@...retlab.ca>
Cc: Marc Zyngier <marc.zyngier@....com>
Cc: Mason <slash.tmp@...e.fr>
Cc: Jason Cooper <jason@...edaemon.net>
Link: http://lkml.kernel.org/r/57A05F5D.103@laposte.net
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
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 4752b43..f10cffe 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -868,7 +868,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);
Powered by blists - more mailing lists