diff options
| author | Todd Poynor <toddpoynor@google.com> | 2011-12-02 14:04:48 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-12-02 14:04:48 +0800 |
| commit | 5dc8351310f897539fc51d1c5bebdf44178b3109 (patch) | |
| tree | f9cf96b45a3636692f055ae081bce72191d5afe2 | |
| parent | 262ae5d13f9cf07fa5c4b4862573a3c74d15e6de (diff) | |
PM: Fix printing IRQ names for pending wakeup IRQs
The IRQ name has moved to the struct irqaction list (so print
first action's name).
Change-Id: I65a627457f9abaf7c1dcc32d8814243ba2ff4717
Signed-off-by: Todd Poynor <toddpoynor@google.com>
| -rw-r--r-- | kernel/irq/pm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index 1f455f36fba..fe4b09cf829 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -106,7 +106,9 @@ int check_wakeup_irqs(void) if (irqd_is_wakeup_set(&desc->irq_data)) { if (desc->istate & IRQS_PENDING) { pr_info("Wakeup IRQ %d %s pending, suspend aborted\n", - irq, desc->name ? desc->name : ""); + irq, + desc->action && desc->action->name ? + desc->action->name : ""); return -EBUSY; } continue; |