diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-21 15:20:27 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-21 15:20:27 +0400 |
| commit | 55b1c558bb2c8407cc2a2c68dd654cf1117ce60b (patch) | |
| tree | 325f2de6ff5d3b21815c0926688363005a8ead2c /kernel/irq | |
| parent | 1be8086741a48bc3766b0ee98c35665290039aaf (diff) | |
| parent | e608a1e336aec6026cf4c06391f4d06169eafdc4 (diff) | |
Merge branch 'rebase-linaro-android-3.4' into merge-linux-linaro-core-tracking
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/pm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index 15e53b1766a6..fe4b09cf829c 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -104,8 +104,13 @@ int check_wakeup_irqs(void) for_each_irq_desc(irq, desc) { if (irqd_is_wakeup_set(&desc->irq_data)) { - if (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; } /* |