From: Geert Uytterhoeven <geert+rene...@glider.be>

[ 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 <geert+rene...@glider.be>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieral...@arm.com>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
---
 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 f09ff4789bb5..8f44a7d14bff 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -1141,7 +1141,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) {
@@ -1196,6 +1198,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;
-- 
2.14.1

Reply via email to