On 1.02.2023 11:15, Johan Hovold wrote:

Make sure to clean up and release resources properly also in case probe fails when populating child devices.

Fixes: 57eb14779dfd ("interconnect: qcom: icc-rpmh: Support child NoC device probe") Cc: stable@vger.kernel.org # 6.0 Cc: Luca Weiss luca.weiss@fairphone.com Signed-off-by: Johan Hovold johan+linaro@kernel.org

---

Reviewed-by: Konrad Dybcio konrad.dybcio@linaro.org

Konrad

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: