summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorMartin Kaiser <martin@kaiser.cx>2021-01-15 22:24:33 +0100
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2021-01-18 15:48:06 +0000
commit3f0ea2360e4826b3aba42f9892bda15b1e38bdf4 (patch)
tree2783ee15d9bb9d2ebb0feb9d1ac9c403d6359cdf /drivers/pci
parent7c53f6b671f4aba70ff15e1b05148b10d58c2837 (diff)
downloadlinux-stable-3f0ea2360e4826b3aba42f9892bda15b1e38bdf4.tar.gz
linux-stable-3f0ea2360e4826b3aba42f9892bda15b1e38bdf4.tar.bz2
linux-stable-3f0ea2360e4826b3aba42f9892bda15b1e38bdf4.zip
PCI: altera-msi: Remove 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/20210115212435.19940-1-martin@kaiser.cx Signed-off-by: Martin Kaiser <martin@kaiser.cx> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/controller/pcie-altera-msi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c
index e1636f7714ca..42691dd8ebef 100644
--- a/drivers/pci/controller/pcie-altera-msi.c
+++ b/drivers/pci/controller/pcie-altera-msi.c
@@ -204,8 +204,7 @@ static int altera_msi_remove(struct platform_device *pdev)
struct altera_msi *msi = platform_get_drvdata(pdev);
msi_writel(msi, 0, MSI_INTMASK);
- irq_set_chained_handler(msi->irq, NULL);
- irq_set_handler_data(msi->irq, NULL);
+ irq_set_chained_handler_and_data(msi->irq, NULL, NULL);
altera_free_domains(msi);