summaryrefslogtreecommitdiffstats
path: root/kernel/irq
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-07-31 20:57:10 +0200
committerThomas Gleixner <tglx@linutronix.de>2014-07-31 20:57:10 +0200
commit21d1f908d39559b013ea857c1685253476b95a4a (patch)
treefbe4194915246428ff831706279508edcae7daeb /kernel/irq
parentirq: Warn when shared interrupts do not match on NO_SUSPEND (diff)
downloadlinux-21d1f908d39559b013ea857c1685253476b95a4a.tar.xz
linux-21d1f908d39559b013ea857c1685253476b95a4a.zip
Revert "PM / sleep / irq: Do not suspend wakeup interrupts"
This reverts commit d709f7bcbb3ab01704fa7b37a2e4b981cf3783c1. Undo, because it might break exisiting functionality. Requested-by: Rafael J. Wysocki <rjw@rjwysocki.net> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/manage.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 27a1fe028afb..53e944811ca6 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -385,8 +385,7 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)
void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)
{
if (suspend) {
- if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND) ||
- irqd_has_set(&desc->irq_data, IRQD_WAKEUP_STATE))
+ if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND))
return;
desc->istate |= IRQS_SUSPENDED;
}