Skip to content

Commit 03b5f0c

Browse files
committed
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
2 parents ee946c3 + 1bc2463 commit 03b5f0c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/irqchip/qcom-irq-combiner.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
1+
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
22
*
33
* This program is free software; you can redistribute it and/or modify
44
* 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)
6868

6969
bit = readl_relaxed(combiner->regs[reg].addr);
7070
status = bit & combiner->regs[reg].enabled;
71-
if (!status)
71+
if (bit && !status)
7272
pr_warn_ratelimited("Unexpected IRQ on CPU%d: (%08x %08lx %p)\n",
7373
smp_processor_id(), bit,
7474
combiner->regs[reg].enabled,

0 commit comments

Comments
 (0)