Commit 88af8129 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas

Merge remote-tracking branch 'lorenzo/pci/rcar' into next

* lorenzo/pci/rcar:
  PCI: rcar: Handle rcar_pcie_parse_request_of_pci_ranges() failures
parents 278a26b6 83c75ddd
...@@ -1123,7 +1123,9 @@ static int rcar_pcie_probe(struct platform_device *pdev) ...@@ -1123,7 +1123,9 @@ static int rcar_pcie_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&pcie->resources); INIT_LIST_HEAD(&pcie->resources);
rcar_pcie_parse_request_of_pci_ranges(pcie); err = rcar_pcie_parse_request_of_pci_ranges(pcie);
if (err)
goto err_free_bridge;
err = rcar_pcie_get_resources(pcie); err = rcar_pcie_get_resources(pcie);
if (err < 0) { if (err < 0) {
...@@ -1178,6 +1180,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) ...@@ -1178,6 +1180,7 @@ static int rcar_pcie_probe(struct platform_device *pdev)
err_free_resource_list: err_free_resource_list:
pci_free_resource_list(&pcie->resources); pci_free_resource_list(&pcie->resources);
err_free_bridge:
pci_free_host_bridge(bridge); pci_free_host_bridge(bridge);
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment