Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / mips / ath25 / ar2315.c

diff --git a/arch/mips/ath25/ar2315.c b/arch/mips/ath25/ar2315.c
index 8742e1cee4928f9d522ec329bb60f113ad67a89d..ec9a371f1e62c49b823bdac3b86d101804796da3 100644 (file)
--- a/arch/mips/ath25/ar2315.c
+++ b/arch/mips/ath25/ar2315.c
@@ -161,8 +161,8 @@ void __init ar2315_arch_init_irq(void)
        irq = irq_create_mapping(domain, AR2315_MISC_IRQ_AHB);
        setup_irq(irq, &ar2315_ahb_err_interrupt);
 
-       irq_set_chained_handler(AR2315_IRQ_MISC, ar2315_misc_irq_handler);
-       irq_set_handler_data(AR2315_IRQ_MISC, domain);
+       irq_set_chained_handler_and_data(AR2315_IRQ_MISC,
+                                        ar2315_misc_irq_handler, domain);
 
        ar2315_misc_irq_domain = domain;
 }