diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-14 12:22:59 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-14 12:22:59 +0300 |
| commit | 4b96583869c4d990b779eca72976063970d41b8d (patch) | |
| tree | f2fdb7760a06f6445f33fdee3ec512fbdb46fcb4 /drivers/irqchip | |
| parent | 53667c670fe00d63246fb3cfb4480bb1ba247bcc (diff) | |
| parent | 67b8d5c7081221efa252e111cd52532ec6d4266f (diff) | |
| download | linux-4b96583869c4d990b779eca72976063970d41b8d.tar.xz | |
Merge tag 'v4.17-rc5' into irq/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/qcom-irq-combiner.c | 4 |
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, |