summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/irq.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-19 22:10:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-19 22:10:05 -0700
commit47126d807ab1ef24e0f02dcca20883e275198fe2 (patch)
treec17b93db77d14239d0dd2d25b084394a645c9733 /arch/arm/mach-davinci/irq.c
parent4746efded84d7c5a9c8d64d4c6e814ff0cf9fb42 (diff)
parent9daedd833a38edd90cf7baa1b1fcf61c3a0721e3 (diff)
downloadblackbird-op-linux-47126d807ab1ef24e0f02dcca20883e275198fe2.tar.gz
blackbird-op-linux-47126d807ab1ef24e0f02dcca20883e275198fe2.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: davinci: DM365 EVM: fix video input mux bits ARM: davinci: Check for NULL return from irq_alloc_generic_chip arm: davinci: Fix low level gpio irq handlers' argument
Diffstat (limited to 'arch/arm/mach-davinci/irq.c')
-rw-r--r--arch/arm/mach-davinci/irq.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c
index d8c1af025931..952dc126c390 100644
--- a/arch/arm/mach-davinci/irq.c
+++ b/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_set_bit;
ct->chip.irq_mask = irq_gc_mask_clr_bit;
OpenPOWER on IntegriCloud