This is a note to let you know that I've just added the patch titled interconnect: qcom: rpmh: fix probe child-node error handling to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: interconnect-qcom-rpmh-fix-probe-child-node-error-handling.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 6570d1d46eeade82965ccc4a3ab7d778898ef4bf Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan+linaro@xxxxxxxxxx> Date: Mon, 6 Mar 2023 08:56:37 +0100 Subject: interconnect: qcom: rpmh: fix probe child-node error handling From: Johan Hovold <johan+linaro@xxxxxxxxxx> commit 6570d1d46eeade82965ccc4a3ab7d778898ef4bf upstream. 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@xxxxxxxxxxxxxxx # 6.0 Cc: Luca Weiss <luca.weiss@xxxxxxxxxxxxx> Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx> Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx> Link: https://lore.kernel.org/r/20230306075651.2449-10-johan+linaro@xxxxxxxxxx Signed-off-by: Georgi Djakov <djakov@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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.40.0 Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are queue-6.1/memory-tegra20-emc-fix-interconnect-registration-race.patch queue-6.1/memory-tegra124-emc-fix-interconnect-registration-race.patch queue-6.1/serial-qcom-geni-fix-console-shutdown-hang.patch queue-6.1/interconnect-exynos-fix-registration-race.patch queue-6.1/interconnect-imx-fix-registration-race.patch queue-6.1/memory-tegra30-emc-fix-interconnect-registration-race.patch queue-6.1/interconnect-qcom-msm8974-fix-registration-race.patch queue-6.1/memory-tegra-fix-interconnect-registration-race.patch queue-6.1/interconnect-qcom-rpm-fix-probe-child-node-error-handling.patch queue-6.1/interconnect-qcom-rpm-fix-registration-race.patch queue-6.1/interconnect-fix-provider-registration-api.patch queue-6.1/interconnect-fix-icc_provider_del-error-handling.patch queue-6.1/interconnect-qcom-rpmh-fix-registration-race.patch queue-6.1/interconnect-fix-mem-leak-when-freeing-nodes.patch queue-6.1/interconnect-qcom-rpmh-fix-probe-child-node-error-handling.patch queue-6.1/interconnect-exynos-fix-node-leak-in-probe-pm-qos-error-path.patch queue-6.1/interconnect-qcom-osm-l3-fix-registration-race.patch