Re: [PATCH] interconnect: qcom: icc-rpmh: Fix an error handling path in qcom_icc_rpmh_probe()

From: Luca Weiss
Date: Mon Nov 21 2022 - 02:43:20 EST


Hi Christophe,

On Sun Nov 20, 2022 at 1:35 PM CET, Christophe JAILLET wrote:
> If of_platform_populate() fails, some resources need to be freed as already
> done in the other error handling paths.
>
> Fixes: 57eb14779dfd ("interconnect: qcom: icc-rpmh: Support child NoC device probe")

I believe the same needs to be applied to icc-rpm.c.

Also there shouldn't be an empty line here between Fixes: and Signed-off-by:

Regards
Luca

>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
> ---
> drivers/interconnect/qcom/icc-rpmh.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/interconnect/qcom/icc-rpmh.c b/drivers/interconnect/qcom/icc-rpmh.c
> index fd17291c61eb..5168bbf3d92f 100644
> --- a/drivers/interconnect/qcom/icc-rpmh.c
> +++ b/drivers/interconnect/qcom/icc-rpmh.c
> @@ -235,8 +235,11 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, qp);
>
> /* Populate child NoC devices if any */
> - if (of_get_child_count(dev->of_node) > 0)
> - return of_platform_populate(dev->of_node, NULL, NULL, dev);
> + if (of_get_child_count(dev->of_node) > 0) {
> + ret = of_platform_populate(dev->of_node, NULL, NULL, dev);
> + if (ret)
> + goto err;
> + }
>
> return 0;
> err:
> --
> 2.34.1