From 196fc8d2bdb2be2d45ce8306aa004adcc3fa1b61 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
Date: Tue, 13 Nov 2012 15:32:22 -0800
Subject: [PATCH] Revert "genirq: Do not consider disabled wakeup irqs"

This reverts commit 9c6079aa1bfcf7e14de10b824779ce39b679bcb8.
---
 kernel/irq/pm.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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