From bbc0e1dce277ae89c6fe3a934c5bda44f0f5fef6 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 27 Apr 2012 12:56:24 +0100
Subject: [PATCH] --- yaml --- r: 299879 b: refs/heads/master c:
 5e7371ded05adfcfcee44a8bc070bfc37979b8f2 h: refs/heads/master i:   299877:
 34390fa8dd7138825bfbba55946031bbb90fc084   299875:
 727b344e16cc5d57e518872e01d77bc4a0edde0f   299871:
 283fc4a85d31956ef8a058d765769fa20a51363a v: v3

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

diff --git a/[refs] b/[refs]
index a39572d2ed42..6060471c3727 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fa99b7f80b4a7ed2cf616eae393bb6d9d51ba8f
+refs/heads/master: 5e7371ded05adfcfcee44a8bc070bfc37979b8f2
diff --git a/trunk/arch/arm/kernel/irq.c b/trunk/arch/arm/kernel/irq.c
index 71ccdbfed662..8349d4e97e2b 100644
--- a/trunk/arch/arm/kernel/irq.c
+++ b/trunk/arch/arm/kernel/irq.c
@@ -155,10 +155,10 @@ static bool migrate_one_irq(struct irq_desc *desc)
 	}
 
 	c = irq_data_get_irq_chip(d);
-	if (c->irq_set_affinity)
-		c->irq_set_affinity(d, affinity, true);
-	else
+	if (!c->irq_set_affinity)
 		pr_debug("IRQ%u: unable to set affinity\n", d->irq);
+	else if (c->irq_set_affinity(d, affinity, true) == IRQ_SET_MASK_OK && ret)
+		cpumask_copy(d->affinity, affinity);
 
 	return ret;
 }