summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorMartin Kaiser <martin@kaiser.cx>2021-01-15 22:15:32 +0100
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2021-01-19 12:19:22 +0000
commit5ce6697a4460d06d4ea3ec8347974176591e1694 (patch)
treeb289cc22fdb672eb909cc9309d69f6406dab9903 /drivers/pci
parentff591f7490cffef49c022e802b64499edb6137b6 (diff)
downloadlinux-stable-5ce6697a4460d06d4ea3ec8347974176591e1694.tar.gz
linux-stable-5ce6697a4460d06d4ea3ec8347974176591e1694.tar.bz2
linux-stable-5ce6697a4460d06d4ea3ec8347974176591e1694.zip
PCI: brcmstb: Remove chained IRQ handler and data in one go
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"). Link: https://lore.kernel.org/r/20210115211532.19837-1-martin@kaiser.cx Signed-off-by: Martin Kaiser <martin@kaiser.cx> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/controller/pcie-brcmstb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index d41257f43a8f..95f6dd93ceae 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -603,8 +603,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);
}