remoteproc: qcom: adsp: Remove subdevs on the error path of adsp_probe()

[ Upstream commit fe80d3205e91e36e67f4d3d6c326793298d15766 ]

Current implementation of adsp_probe() in qcom_q6v5_adsp.c and does not
remove the subdevs of adsp on the error path. Fix this bug by calling
qcom_remove_{ssr,sysmon,pdm,smd,glink}_subdev(), and qcom_q6v5_deinit()
appropriately.

Fixes: dc160e449122 ("remoteproc: qcom: Introduce Non-PAS ADSP PIL driver")
Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Link: https://lore.kernel.org/r/fed3df4219543d46b88bacf87990d947f3fac8d7.1731038950.git.joe@pf.is.s.u-tokyo.ac.jp
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
index 572dcb0f055b764f36d0da7c851dcc707bb5ff6e..223f6ca0745d3dfe780b7680780db90bfce85edd 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@ -734,15 +734,22 @@ static int adsp_probe(struct platform_device *pdev)
                                              desc->ssctl_id);
        if (IS_ERR(adsp->sysmon)) {
                ret = PTR_ERR(adsp->sysmon);
-               goto disable_pm;
+               goto deinit_remove_glink_pdm_ssr;
        }
 
        ret = rproc_add(rproc);
        if (ret)
-               goto disable_pm;
+               goto remove_sysmon;
 
        return 0;
 
+remove_sysmon:
+       qcom_remove_sysmon_subdev(adsp->sysmon);
+deinit_remove_glink_pdm_ssr:
+       qcom_q6v5_deinit(&adsp->q6v5);
+       qcom_remove_glink_subdev(rproc, &adsp->glink_subdev);
+       qcom_remove_pdm_subdev(rproc, &adsp->pdm_subdev);
+       qcom_remove_ssr_subdev(rproc, &adsp->ssr_subdev);
 disable_pm:
        qcom_rproc_pds_detach(adsp);