From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932791AbcIBQPr (ORCPT ); Fri, 2 Sep 2016 12:15:47 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54530 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932236AbcIBQPn (ORCPT ); Fri, 2 Sep 2016 12:15:43 -0400 Date: Fri, 2 Sep 2016 09:15:01 -0700 From: tip-bot for Sebastian Frias Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, sf84@laposte.net, marc.zyngier@arm.com, jason@lakedaemon.net, hpa@zytor.com, grant.likely@secretlab.ca, slash.tmp@free.fr Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, marc.zyngier@arm.com, sf84@laposte.net, jason@lakedaemon.net, hpa@zytor.com, grant.likely@secretlab.ca, slash.tmp@free.fr In-Reply-To: <57A05F5D.103@laposte.net> References: <57A05F5D.103@laposte.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqdomain: Mask irq type in irq_domain_xlate_onetwocell() Git-Commit-ID: 0c228919e04ddec195402296e7ebf2472ed6caef X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 0c228919e04ddec195402296e7ebf2472ed6caef Gitweb: http://git.kernel.org/tip/0c228919e04ddec195402296e7ebf2472ed6caef Author: Sebastian Frias AuthorDate: Tue, 2 Aug 2016 10:52:45 +0200 Committer: Thomas Gleixner 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 Cc: Grant Likely Cc: Marc Zyngier Cc: Mason Cc: Jason Cooper Link: http://lkml.kernel.org/r/57A05F5D.103@laposte.net Signed-off-by: Thomas Gleixner --- 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);