[PATCH AUTOSEL 5.1 063/186] PCI: dwc: Free MSI in dw_pcie_host_init() error path

[Sasha Levin]

From: Jisheng Zhang <jisheng.zh...@synaptics.com>

[ Upstream commit 9e2b5de5604a6ff2626c51e77014d92c9299722c ]

If we ever did MSI-related initializations, we need to call
dw_pcie_free_msi() in the error code path.

Remove the IS_ENABLED(CONFIG_PCI_MSI) check for MSI init because
pci_msi_enabled() already has a stub for !CONFIG_PCI_MSI.

Signed-off-by: Jisheng Zhang <jisheng.zh...@synaptics.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieral...@arm.com>
Signed-off-by: Bjorn Helgaas <bhelg...@google.com>
Acked-by: Gustavo Pimentel <gustavo.pimen...@synopsys.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/pci/controller/dwc/pcie-designware-host.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c 
b/drivers/pci/controller/dwc/pcie-designware-host.c
index 25087d3c9a823..acd185b4661e1 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -439,7 +439,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
        if (ret)
                pci->num_viewport = 2;
 
-       if (IS_ENABLED(CONFIG_PCI_MSI) && pci_msi_enabled()) {
+       if (pci_msi_enabled()) {
                /*
                 * If a specific SoC driver needs to change the
                 * default number of vectors, it needs to implement
@@ -477,7 +477,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
        if (pp->ops->host_init) {
                ret = pp->ops->host_init(pp);
                if (ret)
-                       goto error;
+                       goto err_free_msi;
        }
 
        pp->root_bus_nr = pp->busn->start;
@@ -491,7 +491,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
 
        ret = pci_scan_root_bus_bridge(bridge);
        if (ret)
-               goto error;
+               goto err_free_msi;
 
        bus = bridge->bus;
 
@@ -507,6 +507,9 @@ int dw_pcie_host_init(struct pcie_port *pp)
        pci_bus_add_devices(bus);
        return 0;
 
+err_free_msi:
+       if (pci_msi_enabled() && !pp->ops->msi_host_init)
+               dw_pcie_free_msi(pp);
 error:
        pci_free_host_bridge(bridge);
        return ret;
-- 
2.20.1