| Message ID | 1512641720-4715-3-git-send-email-geert+renesas@glider.be |
|---|---|
| State | Accepted |
| Headers | show |
| Series | PCI: rcar: Misc error path fixes | expand |
On Thu, Dec 07, 2017 at 11:15:20AM +0100, Geert Uytterhoeven wrote: > 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> > --- > drivers/pci/host/pcie-rcar.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index 52ab3cb0a0bfe065..95ca4a1feba4b759 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(&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; > -- > 2.7.4 >
On Thu, Dec 07, 2017 at 11:15:20AM +0100, Geert Uytterhoeven wrote: > 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> > --- > drivers/pci/host/pcie-rcar.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Applied to pci/rcar for v4.16. Thanks, Lorenzo > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index 52ab3cb0a0bfe065..95ca4a1feba4b759 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(&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; > -- > 2.7.4 >
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 52ab3cb0a0bfe065..95ca4a1feba4b759 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(&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;
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> --- drivers/pci/host/pcie-rcar.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)