diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2011-01-28 21:58:22 -0800 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2011-01-28 21:58:22 -0800 |
| commit | bfb8b878f3e4b004eae71ad55ad3f3baca57452a (patch) | |
| tree | 6c3192a7486e53b138d2620c99ef62103e46ea57 /kernel | |
| parent | 8f47f22d81d514a3c947d161b2fcd4a51351a5da (diff) | |
| parent | 6f0193721acf50368b585e3fad8c206049e2e07a (diff) | |
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/pm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index 0d4005d85b03..1df62ef4713b 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -72,8 +72,12 @@ int check_wakeup_irqs(void) int irq; for_each_irq_desc(irq, desc) - if ((desc->status & IRQ_WAKEUP) && (desc->status & IRQ_PENDING)) + if ((desc->status & IRQ_WAKEUP) && + (desc->status & IRQ_PENDING)) { + pr_info("Wakeup IRQ %d %s pending, suspend aborted\n", + irq, desc->name ? desc->name : ""); return -EBUSY; + } return 0; } |