diff options
| author | Johan Hovold <johan+linaro@kernel.org> | 2023-03-06 10:56:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-22 15:33:57 +0300 |
| commit | 1d7dd7291b885589cb055f945a4c2343c554022a (patch) | |
| tree | 10311cf97e979a1dfd376f0a36e7c3dad1c8cf51 /drivers/interconnect | |
| parent | 306b406e4ec9c5c246d6c6c9d88253eade5ddcc2 (diff) | |
| download | linux-1d7dd7291b885589cb055f945a4c2343c554022a.tar.xz | |
interconnect: qcom: rpm: fix probe child-node error handling
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@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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 39e43b957599..b00df2048b7f 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -544,8 +544,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: |