Previously we allocated the PCI resource list in
gen_pci_parse_request_of_pci_ranges(), but if we had an error, we freed it
on error in gen_pci_init().
Reorder gen_pci_init() so we can take care of error path cleanup in
gen_pci_parse_request_of_pci_ranges() instead.
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
---
drivers/pci/host/pci-host-common.c | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/drivers/pci/host/pci-host-common.c b/drivers/pci/host/pci-host-common.c
index 8cba7ab..16a4e61 100644
--- a/drivers/pci/host/pci-host-common.c
+++ b/drivers/pci/host/pci-host-common.c
@@ -73,6 +73,7 @@ static int gen_pci_parse_request_of_pci_ranges(struct device *dev,
return 0;
out_release_res:
+ pci_free_resource_list(resources);
return err;
}
@@ -89,33 +90,30 @@ static struct pci_config_window *gen_pci_init(struct device *dev,
struct resource *bus_range = NULL;
struct pci_config_window *cfg;
- /* Parse our PCI ranges and request their resources */
- err = gen_pci_parse_request_of_pci_ranges(dev, resources, &bus_range);
- if (err)
- goto err_out;
-
err = of_address_to_resource(dev->of_node, 0, &cfgres);
if (err) {
dev_err(dev, "missing \"reg\" property\n");
- goto err_out;
+ return err;
}
cfg = pci_ecam_create(dev, &cfgres, bus_range, ops);
- if (IS_ERR(cfg)) {
- err = PTR_ERR(cfg);
- goto err_out;
- }
+ if (IS_ERR(cfg))
+ return PTR_ERR(cfg);
err = devm_add_action(dev, gen_pci_unmap_cfg, cfg);
- if (err) {
- gen_pci_unmap_cfg(cfg);
- goto err_out;
- }
+ if (err)
+ goto err_cfg;
+
+ /* Parse our PCI ranges and request their resources */
+ err = gen_pci_parse_request_of_pci_ranges(dev, resources, &bus_range);
+ if (err)
+ goto err_cfg;
+
return cfg;
-err_out:
- pci_free_resource_list(resources);
- return ERR_PTR(err);
+err_cfg:
+ gen_pci_unmap_cfg(cfg);
+ return err;
}
int pci_host_common_probe(struct platform_device *pdev,
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
