Commit fe80d320 authored by Joe Hattori's avatar Joe Hattori Committed by Bjorn Andersson
Browse files

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



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: dc160e44 ("remoteproc: qcom: Introduce Non-PAS ADSP PIL driver")
Signed-off-by: default avatarJoe 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: default avatarBjorn Andersson <andersson@kernel.org>
parent 587b67cf

drivers/remoteproc/qcom_q6v5_adsp.c

+9 −2
Original line number Diff line number Diff line
@@ -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);