From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Jul 2011 05:10:05 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
X-Git-Tag: v3.0~11
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=47126d807ab1ef24e0f02dcca20883e275198fe2;p=karo-tx-linux.git

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
---

47126d807ab1ef24e0f02dcca20883e275198fe2
diff --cc arch/arm/mach-davinci/irq.c
index d8c1af025931,85e77fd9d56a..952dc126c390
--- a/arch/arm/mach-davinci/irq.c
+++ b/arch/arm/mach-davinci/irq.c
@@@ -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;