This is a note to let you know that I've just added the patch titled
interconnect: qcom: rpm: fix probe child-node error handling
to the 6.2-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-rpm-fix-probe-child-node-error-handling.patch
and it can be found in the queue-6.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From bc463201f60803fa6bf2741d59441031cd0910e4 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Mon, 6 Mar 2023 08:56:34 +0100
Subject: interconnect: qcom: rpm: fix probe child-node error handling
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit bc463201f60803fa6bf2741d59441031cd0910e4 upstream.
Make sure to clean up and release resources properly also in case probe
fails when populating child devices.
Fixes: e39bf2972c6e ("interconnect: icc-rpm: Support child NoC device probe")
Cc: stable@xxxxxxxxxxxxxxx # 5.17
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230306075651.2449-7-johan+linaro@xxxxxxxxxx
Signed-off-by: Georgi Djakov <djakov@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/interconnect/qcom/icc-rpm.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- a/drivers/interconnect/qcom/icc-rpm.c
+++ b/drivers/interconnect/qcom/icc-rpm.c
@@ -541,8 +541,11 @@ regmap_done:
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:
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.2/memory-tegra20-emc-fix-interconnect-registration-race.patch
queue-6.2/memory-tegra124-emc-fix-interconnect-registration-race.patch
queue-6.2/serial-qcom-geni-fix-console-shutdown-hang.patch
queue-6.2/interconnect-exynos-fix-registration-race.patch
queue-6.2/interconnect-imx-fix-registration-race.patch
queue-6.2/memory-tegra30-emc-fix-interconnect-registration-race.patch
queue-6.2/interconnect-qcom-msm8974-fix-registration-race.patch
queue-6.2/memory-tegra-fix-interconnect-registration-race.patch
queue-6.2/interconnect-qcom-rpm-fix-probe-child-node-error-handling.patch
queue-6.2/interconnect-qcom-rpm-fix-registration-race.patch
queue-6.2/interconnect-fix-provider-registration-api.patch
queue-6.2/interconnect-fix-icc_provider_del-error-handling.patch
queue-6.2/interconnect-qcom-rpmh-fix-registration-race.patch
queue-6.2/interconnect-fix-mem-leak-when-freeing-nodes.patch
queue-6.2/interconnect-qcom-rpmh-fix-probe-child-node-error-handling.patch
queue-6.2/interconnect-exynos-fix-node-leak-in-probe-pm-qos-error-path.patch
queue-6.2/interconnect-qcom-osm-l3-fix-registration-race.patch
