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-07-01 13:34:57 -0700 |
| commit | 196fc8d2bdb2be2d45ce8306aa004adcc3fa1b61 (patch) | |
| tree | 3b8f8f0aaa460beb1afe215f359c9190a362f2e2 | |
| parent | 8608d7c4418c75841c562a90cddd9beae5798a48 (diff) | |
| download | olio-linux-3.10-196fc8d2bdb2be2d45ce8306aa004adcc3fa1b61.tar.xz olio-linux-3.10-196fc8d2bdb2be2d45ce8306aa004adcc3fa1b61.zip | |
Revert "genirq: Do not consider disabled wakeup irqs"
This reverts commit 9c6079aa1bfcf7e14de10b824779ce39b679bcb8.
| -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; } |