Call irq_set_chained_handler_and_data() to clear the chained handler
and the handler's data under irq_desc->lock.

See also 2cf5a03cb29d ("PCI/keystone: Fix race in installing chained
IRQ handler").

Signed-off-by: Martin Kaiser <mar...@kaiser.cx>
Acked-by: Florian Fainelli <f.faine...@gmail.com>
---
v2:
 - rewrite the commit message to clarify that this is a bugfix

 drivers/pci/controller/pcie-brcmstb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/pci/controller/pcie-brcmstb.c 
b/drivers/pci/controller/pcie-brcmstb.c
index bea86899bd5d..7c666f4deb47 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -606,8 +606,7 @@ static void brcm_msi_remove(struct brcm_pcie *pcie)
 
        if (!msi)
                return;
-       irq_set_chained_handler(msi->irq, NULL);
-       irq_set_handler_data(msi->irq, NULL);
+       irq_set_chained_handler_and_data(msi->irq, NULL, NULL);
        brcm_free_domains(msi);
 }
 
-- 
2.20.1

Reply via email to