---

yaml --- r: 222960 b: refs/heads/master c: 8750750 h: refs/heads/master v: v3
git-mirror · Dec 6, 2010 · 629e2e4 · 629e2e4
1 parent f63f619
commit 629e2e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5542a0f9aca5588a0afd0489c26d858405bfecb
+refs/heads/master: 87507500b7fc3620e467abb617a3452f0cccc72d
diff --git a/trunk/arch/arm/common/gic.c b/trunk/arch/arm/common/gic.c
@@ -146,9 +146,15 @@ static int gic_set_cpu(unsigned int irq, const struct cpumask *mask_val)
 	unsigned int shift = (irq % 4) * 8;
 	unsigned int cpu = cpumask_first(mask_val);
 	u32 val;
+	struct irq_desc *desc;
 
 	spin_lock(&irq_controller_lock);
-	irq_desc[irq].node = cpu;
+	desc = irq_to_desc(irq);
+	if (desc == NULL) {
+		spin_unlock(&irq_controller_lock);
+		return -EINVAL;
+	}
+	desc->node = cpu;
 	val = readl(reg) & ~(0xff << shift);
 	val |= 1 << (cpu + shift);
 	writel(val, reg);