From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753105AbcHBJMU (ORCPT ); Tue, 2 Aug 2016 05:12:20 -0400 Received: from smtpoutz299.laposte.net ([178.22.154.199]:55100 "EHLO smtpoutz2.laposte.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751795AbcHBJL7 (ORCPT ); Tue, 2 Aug 2016 05:11:59 -0400 To: Grant Likely , Thomas Gleixner , Marc Zyngier , Jason Cooper Cc: LKML , Mason From: Sebastian Frias Subject: [PATCH 1/2] irqdomain: fix irq_domain_xlate_onetwocell() Message-ID: <57A063B8.5050209@laposte.net> Date: Tue, 2 Aug 2016 11:11:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-VR-SrcIP: 78.31.43.6 X-VR-FullState: 0 X-VR-Score: -100 X-VR-Cause-1: gggruggvucftvghtrhhoucdtuddrfeeltddrjeejgddtjecutefuodetggdotefrodftvfcurfhrohhf X-VR-Cause-2: ihhlvgemucfntefrqffuvffgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhs X-VR-Cause-3: ucdlqddutddtmdenucfjughrpefvhffukffffgggtgfgsehtjegrtddtfeejnecuhfhrohhmpefuvggs X-VR-Cause-4: rghsthhirghnucfhrhhirghsuceoshhfkeegsehlrghpohhsthgvrdhnvghtqeenucfkphepjeekrdef X-VR-Cause-5: uddrgeefrdeinecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghloheplgdujedvrddvjedr X-VR-Cause-6: tddrvddugegnpdhinhgvthepjeekrdefuddrgeefrdeipdhmrghilhhfrhhomhepshhfkeegsehlrghp X-VR-Cause-7: ohhsthgvrdhnvghtpdhrtghpthhtohepghhrrghnthdrlhhikhgvlhihsehsvggtrhgvthhlrggsrdgt X-VR-Cause-8: rg X-VR-AvState: No X-VR-State: 0 X-VR-State: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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