Revert "genirq: Do not consider disabled wakeup irqs"
authorArve Hjønnevåg <arve@android.com>
Tue, 13 Nov 2012 23:32:22 +0000 (15:32 -0800)
committerArve Hjønnevåg <arve@android.com>
Mon, 1 Jul 2013 20:34:57 +0000 (13:34 -0700)
This reverts commit 9c6079aa1bfcf7e14de10b824779ce39b679bcb8.

kernel/irq/pm.c

index cb228bf217603d6e841c1028dd610598ae133bff..15e53b1766a653e4634eea3278e19354211378a1 100644 (file)
@@ -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;
                }