mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-24 10:28:57 +00:00
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
This commit is contained in:
commit
03b5f0c138
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user