From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 31 Jul 2014 18:57:10 +0000 (+0200)
Subject: Revert "PM / sleep / irq: Do not suspend wakeup interrupts"
X-Git-Tag: v3.17-rc1~110^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=21d1f908d39559b013ea857c1685253476b95a4a;p=linux.git

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>
---

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;
 	}