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

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

diff --git a/arch/mips/pci/pci-ar2315.c b/arch/mips/pci/pci-ar2315.c
index dadb30306a0a10457782801eaec567544816c7d7..f8d0acb4f973635ff323585ce4e5a2166c081a3a 100644 (file)
--- a/arch/mips/pci/pci-ar2315.c
+++ b/arch/mips/pci/pci-ar2315.c
@@ -384,8 +384,8 @@ static void ar2315_pci_irq_init(struct ar2315_pci_ctrl *apc)
 
        apc->irq_ext = irq_create_mapping(apc->domain, AR2315_PCI_IRQ_EXT);
 
-       irq_set_chained_handler(apc->irq, ar2315_pci_irq_handler);
-       irq_set_handler_data(apc->irq, apc);
+       irq_set_chained_handler_and_data(apc->irq, ar2315_pci_irq_handler,
+                                        apc);
 
        /* Clear any pending Abort or external Interrupts
         * and enable interrupt processing */