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

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

drivers/pci/host/pcie-rcar.c

+4 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,9 @@ static int rcar_pcie_probe(struct platform_device *pdev) 


	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);

	if (err < 0) {
@@ -1178,6 +1180,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) 


err_free_resource_list:

	pci_free_resource_list(&pcie->resources);

err_free_bridge:

	pci_free_host_bridge(bridge);



	return err;