[PATCH AUTOSEL for 4.15 55/78] PCI: rcar: Handle rcar_pcie_parse_request_of_pci_ranges() failures

[Sasha Levin]

From: Geert Uytterhoeven 

[ Upstream commit 83c75ddd816e979802bd244ad494139f28152921 ]

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 
Signed-off-by: Lorenzo Pieralisi 
Signed-off-by: Sasha Levin 
---
 drivers/pci/host/pcie-rcar.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

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)
 
INIT_LIST_HEAD(>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(>resources);
+err_free_bridge:
pci_free_host_bridge(bridge);
 
return err;
-- 
2.14.1

[PATCH AUTOSEL for 4.15 55/78] PCI: rcar: Handle rcar_pcie_parse_request_of_pci_ranges() failures

[Sasha Levin]

From: Geert Uytterhoeven 

[ Upstream commit 83c75ddd816e979802bd244ad494139f28152921 ]

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 
Signed-off-by: Lorenzo Pieralisi 
Signed-off-by: Sasha Levin 
---
 drivers/pci/host/pcie-rcar.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

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)
 
INIT_LIST_HEAD(>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(>resources);
+err_free_bridge:
pci_free_host_bridge(bridge);
 
return err;
-- 
2.14.1