---

yaml --- r: 299879 b: refs/heads/master c: 5e7371d h: refs/heads/master i: 299877: 34390fa 299875: 727b344 299871: 283fc4a v: v3
git-mirror · Apr 28, 2012 · bbc0e1d · bbc0e1d
1 parent 901cec4
commit bbc0e1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;
 }