---

yaml --- r: 255005 b: refs/heads/master c: 33e1e5e h: refs/heads/master i: 255003: 97000ed v: v3
git-mirror · Jul 19, 2011 · e2ab0b9 · e2ab0b9
1 parent ddf4fd7
commit e2ab0b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f299bb9527abfa6ee45a5e26288b5e3a619f01d6
+refs/heads/master: 33e1e5e317b0fc78ac6588ec8aa40005bcddd7ce
diff --git a/trunk/arch/arm/mach-davinci/irq.c b/trunk/arch/arm/mach-davinci/irq.c
@@ -52,6 +52,12 @@ davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
 	struct irq_chip_type *ct;
 
 	gc = irq_alloc_generic_chip("AINTC", 1, irq_start, base, handle_edge_irq);
+	if (!gc) {
+		pr_err("%s: irq_alloc_generic_chip for IRQ %u failed\n",
+		       __func__, irq_start);
+		return;
+	}
+
 	ct = gc->chip_types;
 	ct->chip.irq_ack = irq_gc_ack;
 	ct->chip.irq_mask = irq_gc_mask_clr_bit;