Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1d722b6 authored by Shawn Lin's avatar Shawn Lin Committed by Bjorn Helgaas
Browse files

PCI: rockchip: Fix rockchip_pcie_probe() error path to free resource list 



rockchip_pcie_probe() calls of_pci_get_host_bridge_resources() to parse
resources from DT and build a resource list.  The caller is responsible for
disposing of the resource list.  This is normally done by
pci_release_host_bridge_dev() when the host bridge is removed.

If the host bridge probe fails, dispose of the resource list in the probe
error path.

[bhelgaas: changelog]
Suggested-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 0b351c98

drivers/pci/host/pcie-rockchip.c

+6 −4
Original line number Diff line number Diff line
@@ -1343,7 +1343,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev) 


	err = devm_request_pci_bus_resources(dev, &res);

	if (err)

		goto err_vpcie;

		goto err_free_res;



	/* Get the I/O and memory ranges from DT */

	resource_list_for_each_entry(win, &res) {
@@ -1376,19 +1376,19 @@ static int rockchip_pcie_probe(struct platform_device *pdev) 


	err = rockchip_cfg_atu(rockchip);

	if (err)

		goto err_vpcie;

		goto err_free_res;



	rockchip->msg_region = devm_ioremap(rockchip->dev,

					    rockchip->msg_bus_addr, SZ_1M);

	if (!rockchip->msg_region) {

		err = -ENOMEM;

		goto err_vpcie;

		goto err_free_res;

	}



	bus = pci_scan_root_bus(&pdev->dev, 0, &rockchip_pcie_ops, rockchip, &res);

	if (!bus) {

		err = -ENOMEM;

		goto err_vpcie;

		goto err_free_res;

	}



	pci_bus_size_bridges(bus);
@@ -1399,6 +1399,8 @@ static int rockchip_pcie_probe(struct platform_device *pdev) 
	pci_bus_add_devices(bus);

	return err;



err_free_res:

	pci_free_resource_list(&res);

err_vpcie:

	if (!IS_ERR(rockchip->vpcie3v3))

		regulator_disable(rockchip->vpcie3v3);