From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754035AbcA0L6A (ORCPT ); Wed, 27 Jan 2016 06:58:00 -0500 Received: from terminus.zytor.com ([198.137.202.10]:34435 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751934AbcA0L56 (ORCPT ); Wed, 27 Jan 2016 06:57:58 -0500 Date: Wed, 27 Jan 2016 03:57:31 -0800 From: tip-bot for Milo Kim Message-ID: Cc: nicolas.ferre@atmel.com, milo.kim@ti.com, mingo@kernel.org, linux-kernel@vger.kernel.org, jason@lakedaemon.net, hpa@zytor.com, tglx@linutronix.de, boris.brezillon@free-electrons.com, marc.zyngier@arm.com, ludovic.desroches@atmel.com Reply-To: jason@lakedaemon.net, linux-kernel@vger.kernel.org, mingo@kernel.org, ludovic.desroches@atmel.com, marc.zyngier@arm.com, boris.brezillon@free-electrons.com, tglx@linutronix.de, hpa@zytor.com, milo.kim@ti.com, nicolas.ferre@atmel.com In-Reply-To: <1452669592-3401-2-git-send-email-milo.kim@ti.com> References: <1452669592-3401-2-git-send-email-milo.kim@ti.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/atmel-aic: Fix wrong bit operation for IRQ priority Git-Commit-ID: 49f34134aea74f19ca016f055d25ee55ec359dee 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: 49f34134aea74f19ca016f055d25ee55ec359dee Gitweb: http://git.kernel.org/tip/49f34134aea74f19ca016f055d25ee55ec359dee Author: Milo Kim AuthorDate: Wed, 13 Jan 2016 16:19:50 +0900 Committer: Thomas Gleixner CommitDate: Wed, 27 Jan 2016 12:54:33 +0100 irqchip/atmel-aic: Fix wrong bit operation for IRQ priority Atmel AIC has common structure for SMR (Source Mode Register). bit[6:5] Interrupt source type bit[2:0] Priority level Other bits are unused. To update new priority value, bit[2:0] should be cleared first and then new priority level can be written. However, aic_common_set_priority() helper clears source type bits instead of priority bits. This patch fixes wrong mask bit operation. Fixes: b1479ebb7720 "irqchip: atmel-aic: Add atmel AIC/AIC5 drivers" Signed-off-by: Milo Kim Acked-by: Boris Brezillon Cc: Jason Cooper Cc: Marc Zyngier Cc: Ludovic Desroches Cc: Nicholas Ferre Cc: stable@vger.kernel.org #v3.17+ Link: http://lkml.kernel.org/r/1452669592-3401-2-git-send-email-milo.kim@ti.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-atmel-aic-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c index b12a5d5..37199b9 100644 --- a/drivers/irqchip/irq-atmel-aic-common.c +++ b/drivers/irqchip/irq-atmel-aic-common.c @@ -86,7 +86,7 @@ int aic_common_set_priority(int priority, unsigned *val) priority > AT91_AIC_IRQ_MAX_PRIORITY) return -EINVAL; - *val &= AT91_AIC_PRIOR; + *val &= ~AT91_AIC_PRIOR; *val |= priority; return 0;