summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-02 10:15:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-02 10:15:39 -0800
commita45299e72737c528975546a0680cace5d7364d27 (patch)
tree45c97b0f789aa09acffeca70af691dc2dd4f19d7 /kernel
parenta0b57ca33ec1cd915ba49051512b3463fa44b4e3 (diff)
parent08332dff8adebb74171e98e008d6c20de6658c42 (diff)
downloadop-kernel-dev-a45299e72737c528975546a0680cace5d7364d27.zip
op-kernel-dev-a45299e72737c528975546a0680cace5d7364d27.tar.gz
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner: - Correction of fuzzy and fragile IRQ_RETVAL macro - IRQ related resume fix affecting only XEN - ARM/GIC fix for chained GIC controllers * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip: Gic: fix boot for chained gics irq: Enable all irqs unconditionally in irq_resume genirq: Correct fuzzy and fragile IRQ_RETVAL() definition
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index cb228bf..abcd6ca 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -50,7 +50,7 @@ static void resume_irqs(bool want_early)
bool is_early = desc->action &&
desc->action->flags & IRQF_EARLY_RESUME;
- if (is_early != want_early)
+ if (!is_early && want_early)
continue;
raw_spin_lock_irqsave(&desc->lock, flags);
OpenPOWER on IntegriCloud