diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-31 22:48:58 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-31 22:48:58 (GMT) |
commit | 30e4c9ad04a7bec4a04b975ce1ad5541d74e1906 (patch) | |
tree | 1a634d92ee41fdf431f11e5a98709ce787528717 /drivers/irqchip/irq-atmel-aic-common.c | |
parent | f25a96eada61ceeaa3ec1a0ed774c99f1d9d9060 (diff) | |
parent | c5b635203032462603c503ecce91a7021c1ad44a (diff) | |
download | linux-30e4c9ad04a7bec4a04b975ce1ad5541d74e1906.tar.xz |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull IRQ fixes from Ingo Molnar:
"Mostly irqchip driver fixes, but also an irq core crash fix and a
build fix"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/mxs: Add missing set_handle_irq()
irqchip/atmel-aic: Fix wrong bit operation for IRQ priority
irqchip/gic-v3-its: Recompute the number of pages on page size change
base: Export platform_msi_domain_[alloc,free]_irqs
of: MSI: Simplify irqdomain lookup
irqdomain: Allow domain lookup with DOMAIN_BUS_WIRED token
irqchip: Fix dependencies for archs w/o HAS_IOMEM
irqchip/s3c24xx: Mark init_eint as __maybe_unused
genirq: Validate action before dereferencing it in handle_irq_event_percpu()
Diffstat (limited to 'drivers/irqchip/irq-atmel-aic-common.c')
-rw-r--r-- | drivers/irqchip/irq-atmel-aic-common.c | 2 |
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 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; |