diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2017-12-07 05:15:20 -0500 |
---|---|---|
committer | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2017-12-19 06:25:43 -0500 |
commit | 83c75ddd816e979802bd244ad494139f28152921 (patch) | |
tree | 3238f78353af3a272f42518a6aa387e57813f7de | |
parent | 1291a0d5049dbc06baaaf66a9ff3f53db493b19b (diff) |
PCI: rcar: Handle rcar_pcie_parse_request_of_pci_ranges() failures
rcar_pcie_parse_request_of_pci_ranges() can fail and return an error
code, but this is not checked nor handled.
Fix this by adding the missing error handling.
Fixes: 5d2917d469faab72 ("PCI: rcar: Convert to DT resource parsing API")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-rw-r--r-- | drivers/pci/host/pcie-rcar.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 52ab3cb0a0bf..95ca4a1feba4 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c | |||
@@ -1123,7 +1123,9 @@ static int rcar_pcie_probe(struct platform_device *pdev) | |||
1123 | 1123 | ||
1124 | INIT_LIST_HEAD(&pcie->resources); | 1124 | INIT_LIST_HEAD(&pcie->resources); |
1125 | 1125 | ||
1126 | rcar_pcie_parse_request_of_pci_ranges(pcie); | 1126 | err = rcar_pcie_parse_request_of_pci_ranges(pcie); |
1127 | if (err) | ||
1128 | goto err_free_bridge; | ||
1127 | 1129 | ||
1128 | err = rcar_pcie_get_resources(pcie); | 1130 | err = rcar_pcie_get_resources(pcie); |
1129 | if (err < 0) { | 1131 | if (err < 0) { |
@@ -1178,6 +1180,7 @@ err_pm_disable: | |||
1178 | 1180 | ||
1179 | err_free_resource_list: | 1181 | err_free_resource_list: |
1180 | pci_free_resource_list(&pcie->resources); | 1182 | pci_free_resource_list(&pcie->resources); |
1183 | err_free_bridge: | ||
1181 | pci_free_host_bridge(bridge); | 1184 | pci_free_host_bridge(bridge); |
1182 | 1185 | ||
1183 | return err; | 1186 | return err; |