From e2ab0b90f8750404ea2f7dd31daadc0179622ea4 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Sat, 16 Jul 2011 22:39:35 -0700 Subject: [PATCH] --- yaml --- r: 255005 b: refs/heads/master c: 33e1e5e317b0fc78ac6588ec8aa40005bcddd7ce h: refs/heads/master i: 255003: 97000ed48edc75268d2b38a63cfc62332a51d254 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/irq.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1596e9c14a8e..de3ee79f66bf 100644 --- 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 index bfe68ec4e1a6..85e77fd9d56a 100644 --- 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;