diff options
| author | Todd Poynor <toddpoynor@google.com> | 2011-07-25 14:54:03 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2011-07-25 15:05:56 -0700 |
| commit | 68cd235dda15c5eb223c86803e9068d2cfbf64b5 (patch) | |
| tree | d6adf414406b502393e93df740802cf46a986724 | |
| parent | 8c59c45bc55f052d7d767d93c88a6f1666dcdecf (diff) | |
| download | kernel_samsung_tuna-68cd235dda15c5eb223c86803e9068d2cfbf64b5.zip kernel_samsung_tuna-68cd235dda15c5eb223c86803e9068d2cfbf64b5.tar.gz kernel_samsung_tuna-68cd235dda15c5eb223c86803e9068d2cfbf64b5.tar.bz2 | |
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 85c1308..f323a4c 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; |