aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/irq-atmel-aic-common.c
diff options
context:
space:
mode:
authorMilo Kim <milo.kim@ti.com>2016-01-13 16:19:50 +0900
committerThomas Gleixner <tglx@linutronix.de>2016-01-27 12:54:33 +0100
commit49f34134aea74f19ca016f055d25ee55ec359dee (patch)
tree59f04e92480c7b87f40f5e3247d7d4e55792983d /drivers/irqchip/irq-atmel-aic-common.c
parentirqchip/gic-v3-its: Recompute the number of pages on page size change (diff)
downloadlinux-dev-49f34134aea74f19ca016f055d25ee55ec359dee.tar.xz
linux-dev-49f34134aea74f19ca016f055d25ee55ec359dee.zip
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@ti.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Ludovic Desroches <ludovic.desroches@atmel.com> Cc: Nicholas Ferre <nicolas.ferre@atmel.com> 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 <tglx@linutronix.de>
Diffstat (limited to '')
-rw-r--r--drivers/irqchip/irq-atmel-aic-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
index b12a5d58546f..37199b9b2cfa 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;