]> git.baikalelectronics.ru Git - kernel.git/commitdiff
PCI: dwc: Correct msi_irq condition in dw_pcie_free_msi()
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Thu, 7 Jul 2022 13:47:28 +0000 (16:47 +0300)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 1 Aug 2022 20:15:32 +0000 (15:15 -0500)
The dwc-based drivers set pp->msi_irq to -ENODEV if they do not want the
dwc core to do anything with pp->msi_irq.

dw_pcie_host_init() sets the handler and data when "pp->msi_irq > 0", so
use the same condition when removing the handler and data in
dw_pcie_free_msi().

Link: https://lore.kernel.org/r/20220707134733.2436629-2-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
drivers/pci/controller/dwc/pcie-designware-host.c

index ff3451a6b8466172c200cc8067c6066300d1ff04..2e638a3226f3e90f301d13826addc67b2de051aa 100644 (file)
@@ -257,7 +257,7 @@ int dw_pcie_allocate_domains(struct dw_pcie_rp *pp)
 
 static void dw_pcie_free_msi(struct dw_pcie_rp *pp)
 {
-       if (pp->msi_irq)
+       if (pp->msi_irq > 0)
                irq_set_chained_handler_and_data(pp->msi_irq, NULL, NULL);
 
        irq_domain_remove(pp->msi_domain);