interconnect: qcom: rpm: fix probe child-node error handling
authorJohan Hovold <johan+linaro@kernel.org>
Mon, 6 Mar 2023 07:56:34 +0000 (08:56 +0100)
committerGeorgi Djakov <djakov@kernel.org>
Tue, 7 Mar 2023 20:19:05 +0000 (22:19 +0200)
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@vger.kernel.org # 5.17
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230306075651.2449-7-johan+linaro@kernel.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>
drivers/interconnect/qcom/icc-rpm.c

index df3196f7253687248bbd00fe2099e6d531171f38..91778cfcbc65d7f2ae05944a9302fd5a95dffab0 100644 (file)
@@ -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: