diff options
| author | Johan Hovold <johan+linaro@kernel.org> | 2023-03-06 08:56:34 +0100 |
|---|---|---|
| committer | Georgi Djakov <djakov@kernel.org> | 2023-03-07 21:19:05 +0100 |
| commit | bc463201f60803fa6bf2741d59441031cd0910e4 (patch) | |
| tree | f0d6f00f037d9af86d2704c562057963fe2f44be /drivers/interconnect | |
| parent | interconnect: qcom: osm-l3: fix registration race (diff) | |
| download | linux-bc463201f60803fa6bf2741d59441031cd0910e4.tar.xz linux-bc463201f60803fa6bf2741d59441031cd0910e4.zip | |
interconnect: qcom: rpm: fix probe child-node error handling
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>
Diffstat (limited to 'drivers/interconnect')
| -rw-r--r-- | drivers/interconnect/qcom/icc-rpm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index df3196f72536..91778cfcbc65 100644 --- 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: |