diff options
| author | Todd Poynor <toddpoynor@google.com> | 2011-07-25 14:54:03 -0700 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-10-28 10:59:30 +0200 |
| commit | 89b8a99eab425df01aca0e5047686c9e0f4c4b26 (patch) | |
| tree | b42aafc9cf9694767d9d169bb8bf890c34e1e449 /kernel | |
| parent | 1bc2bedb5d90793abb6ce98c51ad5040db1e9a96 (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>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35552
Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com>
Reviewed-by: QABUILD
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'kernel')
| -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 85c13082b0c..f323a4cd58e 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -72,7 +72,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; |