From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 Jul 2011 19:47:11 +0000 (-0700)
Subject: Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=94b0522ab77e4d74950e258e804ba05030b6fcff;p=linux-beck.git

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: DMA Cleanup as per sparse
  ARM: SAMSUNG: Check NULL return from irq_alloc_generic_chip
---

94b0522ab77e4d74950e258e804ba05030b6fcff
diff --cc arch/arm/plat-samsung/irq-uart.c
index 0e46588d847b,38c53646bd64..657405c481d0
--- a/arch/arm/plat-samsung/irq-uart.c
+++ b/arch/arm/plat-samsung/irq-uart.c
@@@ -54,8 -54,15 +54,15 @@@ static void __init s3c_init_uart_irq(st
  
  	gc = irq_alloc_generic_chip("s3c-uart", 1, uirq->base_irq, reg_base,
  				    handle_level_irq);
+ 
+ 	if (!gc) {
+ 		pr_err("%s: irq_alloc_generic_chip for IRQ %u failed\n",
+ 		       __func__, uirq->base_irq);
+ 		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_set_bit;
  	ct->chip.irq_unmask = irq_gc_mask_clr_bit;
  	ct->regs.ack = S3C64XX_UINTP;