diff options
| author | Todd Poynor <toddpoynor@google.com> | 2011-12-13 01:23:48 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-12-26 16:42:42 +0800 |
| commit | a22c0a46d4a45c0bed43d71a9ba3431331092d5e (patch) | |
| tree | f573d0ca713f4e9478150183125086f0014ea2de | |
| parent | 69117790f0ee03d3ed0bf26cc913e02ee2f18cb8 (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; |