Merge remote-tracking branch 'lorenzo/pci/rcar' into next (88af8129) · Commits · e / devices / android_kernel_fairphone_FP5

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;