diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 17:14:25 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 17:14:25 +0900 |
| commit | 236573d2405d6b9fa5395d14731c2ec2f8cb8f4f (patch) | |
| tree | ff261b48f83b55785d146a36d88fa2a51479e247 /kernel/irq/pm.c | |
| parent | 97aee1b8e444d0aa4904fb5d4850c9490e5b9935 (diff) | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
Merge tag 'v3.13-rc3' into dt3-base
Linux 3.13-rc3
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
drivers/pinctrl/sh-pfc/pfc-sh7372.c
Diffstat (limited to 'kernel/irq/pm.c')
| -rw-r--r-- | kernel/irq/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index cb228bf21760..abcd6ca86cb7 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); |