PCI/keystone: Fix race in installing chained IRQ handler

[cascardo/linux.git] / drivers / pci / host / pci-keystone.c

diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index 75333b0..47cf0c1 100644 (file)
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -223,10 +223,9 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)
        /* MSI IRQ */
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                for (i = 0; i < ks_pcie->num_msi_host_irqs; i++) {
-                       irq_set_chained_handler(ks_pcie->msi_host_irqs[i],
-                                               ks_pcie_msi_irq_handler);
-                       irq_set_handler_data(ks_pcie->msi_host_irqs[i],
-                                            ks_pcie);
+                       irq_set_chained_handler_and_data(ks_pcie->msi_host_irqs[i],
+                                                        ks_pcie_msi_irq_handler,
+                                                        ks_pcie);
                }
        }
 }