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

remoteproc: qcom: wcss: Remove subdevs on the error path of q6v5_wcss_probe() 



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

Signed-off-by: default avatarJoe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Link: https://lore.kernel.org/r/c4437393bfaeda69351157849b5e0a904586b1c2.1731038950.git.joe@pf.is.s.u-tokyo.ac.jp


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent fe80d320

drivers/remoteproc/qcom_q6v5_wcss.c

+17 −2
Original line number Diff line number Diff line
@@ -1056,18 +1056,33 @@ static int q6v5_wcss_probe(struct platform_device *pdev) 
	qcom_add_pdm_subdev(rproc, &wcss->pdm_subdev);

	qcom_add_ssr_subdev(rproc, &wcss->ssr_subdev, "q6wcss");



	if (desc->ssctl_id)

	if (desc->ssctl_id) {

		wcss->sysmon = qcom_add_sysmon_subdev(rproc,

						      desc->sysmon_name,

						      desc->ssctl_id);

		if (IS_ERR(wcss->sysmon)) {

			ret = PTR_ERR(wcss->sysmon);

			goto deinit_remove_subdevs;

		}

	}



	ret = rproc_add(rproc);

	if (ret)

		return ret;

		goto remove_sysmon_subdev;



	platform_set_drvdata(pdev, rproc);



	return 0;



remove_sysmon_subdev:

	if (desc->ssctl_id)

		qcom_remove_sysmon_subdev(wcss->sysmon);

deinit_remove_subdevs:

	qcom_q6v5_deinit(&wcss->q6v5);

	qcom_remove_glink_subdev(rproc, &wcss->glink_subdev);

	qcom_remove_pdm_subdev(rproc, &wcss->pdm_subdev);

	qcom_remove_ssr_subdev(rproc, &wcss->ssr_subdev);

	return ret;

}



static void q6v5_wcss_remove(struct platform_device *pdev)