Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jul 2011 05:10:05 +0000 (22:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jul 2011 05:10:05 +0000 (22:10 -0700)
* '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

1  2 
arch/arm/mach-davinci/irq.c

index d8c1af02593100e586d0fd39cb25cac71dc0a21d,85e77fd9d56a17546ff59ed0cbd560f4d5edbb7c..952dc126c390cca25e1b33e838cbc282ab501ccc
@@@ -52,8 -52,14 +52,14 @@@ davinci_alloc_gc(void __iomem *base, un
        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_ack = irq_gc_ack_set_bit;
        ct->chip.irq_mask = irq_gc_mask_clr_bit;
        ct->chip.irq_unmask = irq_gc_mask_set_bit;