diff options
| author | Todd Poynor <toddpoynor@google.com> | 2011-07-25 14:54:03 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:55 -0800 |
| commit | c7f4f9b136a58702248f08497cf31f06e8078e76 (patch) | |
| tree | 498a2cd7313e606898e3e757a765504c02ab6fe2 /kernel | |
| parent | 5587ae4b0a4215d642693137b7e0623e020ef4b2 (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>
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 1f455f36fba3..fe4b09cf829c 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; |