openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* lorenzo/pci/rcar:
  PCI: rcar: Handle rcar_pcie_parse_request_of_pci_ranges() failures
This commit is contained in:
Bjorn Helgaas 2018-02-01 11:40:04 -06:00 committed by Bjorn Helgaas
parent 278a26b6e8 83c75ddd81
commit 88af81297b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pci/host/pcie-rcar.c
View File

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