From: Arve Hjønnevåg <arve@android.com>
Date: Tue, 13 Nov 2012 23:32:22 +0000 (-0800)
Subject: Revert "genirq: Do not consider disabled wakeup irqs"
X-Git-Tag: firefly_0821_release~4090^2~896
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=196fc8d2bdb2be2d45ce8306aa004adcc3fa1b61;p=firefly-linux-kernel-4.4.55.git

Revert "genirq: Do not consider disabled wakeup irqs"

This reverts commit 9c6079aa1bfcf7e14de10b824779ce39b679bcb8.
---

diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index cb228bf21760..15e53b1766a6 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -103,13 +103,8 @@ int check_wakeup_irqs(void)
 	int irq;
 
 	for_each_irq_desc(irq, desc) {
-		/*
-		 * Only interrupts which are marked as wakeup source
-		 * and have not been disabled before the suspend check
-		 * can abort suspend.
-		 */
 		if (irqd_is_wakeup_set(&desc->irq_data)) {
-			if (desc->depth == 1 && desc->istate & IRQS_PENDING)
+			if (desc->istate & IRQS_PENDING)
 				return -EBUSY;
 			continue;
 		}