[tip:irq/urgent] irqchip/atmel-aic: Fix wrong bit operation for IRQ priority

From: tip-bot for Milo Kim
Date: Wed Jan 27 2016 - 06:58:25 EST

Commit-ID: 49f34134aea74f19ca016f055d25ee55ec359dee
Gitweb: http://git.kernel.org/tip/49f34134aea74f19ca016f055d25ee55ec359dee
Author: Milo Kim <milo.kim@xxxxxx>
AuthorDate: Wed, 13 Jan 2016 16:19:50 +0900
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
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 <milo.kim@xxxxxx>
Acked-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx>
Cc: Jason Cooper <jason@xxxxxxxxxxxxxx>
Cc: Marc Zyngier <marc.zyngier@xxxxxxx>
Cc: Ludovic Desroches <ludovic.desroches@xxxxxxxxx>
Cc: Nicholas Ferre <nicolas.ferre@xxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx #v3.17+
Link: http://lkml.kernel.org/r/1452669592-3401-2-git-send-email-milo.kim@xxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
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)
return -EINVAL;

- *val &= AT91_AIC_PRIOR;
+ *val &= ~AT91_AIC_PRIOR;
*val |= priority;

return 0;