From ac421fb99a2e7d098f65194662ee562c1692de7b Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 16 Jun 2010 00:09:35 +0000
Subject: [PATCH] --- yaml --- r: 200909 b: refs/heads/master c:
 3cd8519248e9e17d982c6fab0f1a89bca6feb49a h: refs/heads/master i:   200907:
 96e65513d16a15c4c1b0a83ad671eb5e47da6a5b v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/kernel/irq.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8e94384e7018..5580370919ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3005fbc696781d2fd7bd5b5389a94fae5332b58
+refs/heads/master: 3cd8519248e9e17d982c6fab0f1a89bca6feb49a
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
index 3333bbdd23ef..77be3d058a65 100644
--- a/trunk/arch/powerpc/kernel/irq.c
+++ b/trunk/arch/powerpc/kernel/irq.c
@@ -295,7 +295,10 @@ void fixup_irqs(const struct cpumask *map)
 
 	for_each_irq(irq) {
 		desc = irq_to_desc(irq);
-		if (desc && desc->status & IRQ_PER_CPU)
+		if (!desc)
+			continue;
+
+		if (desc->status & IRQ_PER_CPU)
 			continue;
 
 		cpumask_and(mask, desc->affinity, map);