summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-05-06 05:34:06 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2018-05-06 05:34:06 -1000
commit03b5f0c138db46380fa51b36944167bca63eb572 (patch)
tree5bb10e005214695362064ec5a9b9d4ae6df9c0a6
parentee946c36be21dcfe044f1c432cd6c6a33682e244 (diff)
parent1bc2463cee92ef0e2034c813d5e511adeb58b5fd (diff)
downloadlinux-03b5f0c138db46380fa51b36944167bca63eb572.tar.gz
linux-03b5f0c138db46380fa51b36944167bca63eb572.tar.bz2
linux-03b5f0c138db46380fa51b36944167bca63eb572.zip
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Thomas Gleixner: "A single fix to prevent false positives in the spurious interrupt detector when more than a single demultiplex register is evaluated in the Qualcom irq combiner driver" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/qcom: Fix check for spurious interrupts
-rw-r--r--drivers/irqchip/qcom-irq-combiner.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/qcom-irq-combiner.c b/drivers/irqchip/qcom-irq-combiner.c
index f31265937439..7f0c0be322e0 100644
--- a/drivers/irqchip/qcom-irq-combiner.c
+++ b/drivers/irqchip/qcom-irq-combiner.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -68,7 +68,7 @@ static void combiner_handle_irq(struct irq_desc *desc)
bit = readl_relaxed(combiner->regs[reg].addr);
status = bit & combiner->regs[reg].enabled;
- if (!status)
+ if (bit && !status)
pr_warn_ratelimited("Unexpected IRQ on CPU%d: (%08x %08lx %p)\n",
smp_processor_id(), bit,
combiner->regs[reg].enabled,