diff options
| author | Arve Hjønnevåg <arve@android.com> | 2012-11-13 15:32:22 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-04-29 14:42:21 -0700 |
| commit | 41cc9d4bc88643cb854a8e03477a446b7f8a621f (patch) | |
| tree | f18be79ec51f8338d3e01521aca4d4f4f4799988 /kernel | |
| parent | 706af3bc0f1cf83e65b8e646620e249c63d65cfe (diff) | |
Revert "genirq: Do not consider disabled wakeup irqs"
This reverts commit 9c6079aa1bfcf7e14de10b824779ce39b679bcb8.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/pm.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index cb228bf2176..15e53b1766a 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; } |