PM: Fix printing IRQ names for pending wakeup IRQs
Todd Poynor [Mon, 25 Jul 2011 21:54:03 +0000 (14:54 -0700)]
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>

kernel/irq/pm.c

index 1f455f3..fe4b09c 100644 (file)
@@ -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;