Merge branches 'stable/backend.base.v3' and 'stable/gntalloc.v7' of git://git.kernel...

[karo-tx-linux.git] / arch / arm / plat-s5p / irq-eint.c

diff --git a/arch/arm/plat-s5p/irq-eint.c b/arch/arm/plat-s5p/irq-eint.c
index f3d15e8c02c1e94b8d5668ec44d68406cb2eb1e8..b5bb774985b0c7db17eaf3aa91e805d05c1ffdfd 100644 (file)
--- a/arch/arm/plat-s5p/irq-eint.c
+++ b/arch/arm/plat-s5p/irq-eint.c
@@ -208,8 +208,7 @@ int __init s5p_init_irq_eint(void)
                irq_set_chip(irq, &s5p_irq_vic_eint);
 
        for (irq = IRQ_EINT(16); irq <= IRQ_EINT(31); irq++) {
-               irq_set_chip(irq, &s5p_irq_eint);
-               irq_set_handler(irq, handle_level_irq);
+               irq_set_chip_and_handler(irq, &s5p_irq_eint, handle_level_irq);
                set_irq_flags(irq, IRQF_VALID);
        }