import PULS_20160108

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / irq / pm.c

diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index abcd6ca86cb76b56e5979613a1964c0db743b5d0..c72b7a43beb9428d3c134584e394db9252569cd2 100644 (file)
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -103,14 +103,14 @@ 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) {
+                               pr_info("Wakeup IRQ %d %s pending, suspend aborted\n",
+                                       irq,
+                                       desc->action && desc->action->name ?
+                                       desc->action->name : "");
                                return -EBUSY;
+                       }
                        continue;
                }
                /*