From 059329c164513ec3331ea92cd833a69d35753e4a Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Sun, 9 Oct 2011 02:30:47 +0100 Subject: 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 --- kernel/irq/pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'kernel') 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; -- cgit v1.2.3