Unverified Commit c75ed9f5 authored by Biju Das's avatar Biju Das Committed by Mark Brown
Browse files

ASoC: sh: rz-ssi: Improve error handling in rz_ssi_probe() error path 



We usually do cleanup in reverse order of init. Currently in case of
error rz_ssi_release_dma_channels() done in the reverse order. This
patch improves error handling in rz_ssi_probe() error path.

While at it, use "goto cleanup" style to reduce code duplication.

Reported-by: default avatarPavel Machek <pavel@denx.de>
Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20220728092612.38858-1-biju.das.jz@bp.renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c0fc96fe

sound/soc/sh/rz-ssi.c

+15 −11
Original line number Diff line number Diff line
@@ -1017,31 +1017,35 @@ static int rz_ssi_probe(struct platform_device *pdev) 


	ssi->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);

	if (IS_ERR(ssi->rstc)) {

		rz_ssi_release_dma_channels(ssi);

		return PTR_ERR(ssi->rstc);

		ret = PTR_ERR(ssi->rstc);

		goto err_reset;

	}



	reset_control_deassert(ssi->rstc);

	pm_runtime_enable(&pdev->dev);

	ret = pm_runtime_resume_and_get(&pdev->dev);

	if (ret < 0) {

		rz_ssi_release_dma_channels(ssi);

		pm_runtime_disable(ssi->dev);

		reset_control_assert(ssi->rstc);

		return dev_err_probe(ssi->dev, ret, "pm_runtime_resume_and_get failed\n");

		dev_err(&pdev->dev, "pm_runtime_resume_and_get failed\n");

		goto err_pm;

	}



	ret = devm_snd_soc_register_component(&pdev->dev, &rz_ssi_soc_component,

					      rz_ssi_soc_dai,

					      ARRAY_SIZE(rz_ssi_soc_dai));

	if (ret < 0) {

		rz_ssi_release_dma_channels(ssi);

		dev_err(&pdev->dev, "failed to register snd component\n");

		goto err_snd_soc;

	}



	return 0;



err_snd_soc:

	pm_runtime_put(ssi->dev);

err_pm:

	pm_runtime_disable(ssi->dev);

	reset_control_assert(ssi->rstc);

		dev_err(&pdev->dev, "failed to register snd component\n");

	}

err_reset:

	rz_ssi_release_dma_channels(ssi);



	return ret;

}