diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 12:47:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 12:47:11 -0700 |
commit | 94b0522ab77e4d74950e258e804ba05030b6fcff (patch) | |
tree | 79e4898ddcfe86b7c529a4529556cd5fc5ec9cab /arch/arm/plat-samsung/irq-uart.c | |
parent | d4bd4b40f8b18ad6a7e269e8f5c06f953f51016d (diff) | |
parent | d670ac019f60e4932ba329bb0800bf2929e6d77c (diff) | |
download | linux-94b0522ab77e4d74950e258e804ba05030b6fcff.tar.gz linux-94b0522ab77e4d74950e258e804ba05030b6fcff.tar.bz2 linux-94b0522ab77e4d74950e258e804ba05030b6fcff.zip |
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
Diffstat (limited to 'arch/arm/plat-samsung/irq-uart.c')
-rw-r--r-- | arch/arm/plat-samsung/irq-uart.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/irq-uart.c b/arch/arm/plat-samsung/irq-uart.c index 0e46588d847b..657405c481d0 100644 --- a/arch/arm/plat-samsung/irq-uart.c +++ b/arch/arm/plat-samsung/irq-uart.c @@ -54,6 +54,13 @@ static void __init s3c_init_uart_irq(struct s3c_uart_irq *uirq) 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_set_bit; ct->chip.irq_mask = irq_gc_mask_set_bit; |