Revert "PM / sleep / irq: Do not suspend wakeup interrupts"
authorThomas Gleixner <tglx@linutronix.de>
Thu, 31 Jul 2014 18:57:10 +0000 (20:57 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 31 Jul 2014 18:57:10 +0000 (20:57 +0200)
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>
kernel/irq/manage.c

index 27a1fe028afb70bb49936e58d0d0385fb4b6bfd8..53e944811ca6a84ceb4dd03ed63bdff2d72e7f19 100644 (file)
@@ -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;
        }