[PATCHv3 3/5] PCI: dwc: fix potential memory leak

[Z.q. Hou]

From: Hou Zhiqiang <zhiqiang....@nxp.com>

To avoid memory leak on error return of the adjacent function
devm_of_pci_get_host_bridge_resources(), change to use
devm_pci_alloc_host_bridge() to allocate host bridge structure,
then it will be managed automatically.

Fixes: 295aeb98a322 ("PCI: designware: Convert PCI scan API to
pci_scan_root_bus_bridge()")
Signed-off-by: Hou Zhiqiang <zhiqiang....@nxp.com>
---
V3:
 - Changed to use devm_* to allocate host bridge. 
 - Added Fixes info.

 .../pci/controller/dwc/pcie-designware-host.c | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c 
b/drivers/pci/controller/dwc/pcie-designware-host.c
index 29a05759a294..33b5a3815d24 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -346,7 +346,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
                dev_err(dev, "Missing *config* reg space\n");
        }
 
-       bridge = pci_alloc_host_bridge(0);
+       bridge = devm_pci_alloc_host_bridge(dev, 0);
        if (!bridge)
                return -ENOMEM;
 
@@ -357,7 +357,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
 
        ret = devm_request_pci_bus_resources(dev, &bridge->windows);
        if (ret)
-               goto error;
+               return ret;
 
        /* Get the I/O and memory ranges from DT */
        resource_list_for_each_entry_safe(win, tmp, &bridge->windows) {
@@ -401,8 +401,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
                                                resource_size(pp->cfg));
                if (!pci->dbi_base) {
                        dev_err(dev, "Error with ioremap\n");
-                       ret = -ENOMEM;
-                       goto error;
+                       return -ENOMEM;
                }
        }
 
@@ -413,8 +412,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
                                        pp->cfg0_base, pp->cfg0_size);
                if (!pp->va_cfg0_base) {
                        dev_err(dev, "Error with ioremap in function\n");
-                       ret = -ENOMEM;
-                       goto error;
+                       return -ENOMEM;
                }
        }
 
@@ -424,8 +422,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
                                                pp->cfg1_size);
                if (!pp->va_cfg1_base) {
                        dev_err(dev, "Error with ioremap\n");
-                       ret = -ENOMEM;
-                       goto error;
+                       return -ENOMEM;
                }
        }
 
@@ -448,14 +445,14 @@ int dw_pcie_host_init(struct pcie_port *pp)
                            pp->num_vectors == 0) {
                                dev_err(dev,
                                        "Invalid number of vectors\n");
-                               goto error;
+                               return -EINVAL;
                        }
                }
 
                if (!pp->ops->msi_host_init) {
                        ret = dw_pcie_allocate_domains(pp);
                        if (ret)
-                               goto error;
+                               return ret;
 
                        if (pp->msi_irq)
                                irq_set_chained_handler_and_data(pp->msi_irq,
@@ -464,14 +461,14 @@ int dw_pcie_host_init(struct pcie_port *pp)
                } else {
                        ret = pp->ops->msi_host_init(pp);
                        if (ret < 0)
-                               goto error;
+                               return ret;
                }
        }
 
        if (pp->ops->host_init) {
                ret = pp->ops->host_init(pp);
                if (ret)
-                       goto error;
+                       return ret;
        }
 
        pp->root_bus_nr = pp->busn->start;
@@ -485,7 +482,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
 
        ret = pci_scan_root_bus_bridge(bridge);
        if (ret)
-               goto error;
+               return ret;
 
        bus = bridge->bus;
 
@@ -499,11 +496,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
                pcie_bus_configure_settings(child);
 
        pci_bus_add_devices(bus);
-       return 0;
 
-error:
-       pci_free_host_bridge(bridge);
-       return ret;
+       return 0;
 }
 
 static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,
-- 
2.17.1