From: Todd Poynor <toddpoynor@google.com>
Date: Mon, 25 Jul 2011 21:54:03 +0000 (-0700)
Subject: PM: Fix printing IRQ names for pending wakeup IRQs
X-Git-Tag: firefly_0821_release~7613^2~398
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=68cd235dda15c5eb223c86803e9068d2cfbf64b5;p=firefly-linux-kernel-4.4.55.git

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>
---

diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index 85c13082b0c7..f323a4cd58ef 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;