Unverified Commit 767e6f26 authored by Lad Prabhakar's avatar Lad Prabhakar Committed by Mark Brown
Browse files

ASoC: sh: rz-ssi: Release the DMA channels in rz_ssi_probe() error path 



DMA channels requested by rz_ssi_dma_request() in rz_ssi_probe() were
never released in the error path apart from one place. This patch fixes
this issue by calling rz_ssi_release_dma_channels() in the error path.

Fixes: 26ac471c ("ASoC: sh: rz-ssi: Add SSI DMAC support")
Reported-by: default avatarPavel Machek <pavel@denx.de>
Signed-off-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://lore.kernel.org/r/20220426074922.13319-4-prabhakar.mahadev-lad.rj@bp.renesas.com


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

sound/soc/sh/rz-ssi.c

+10 −3
Original line number Diff line number Diff line
@@ -976,14 +976,18 @@ static int rz_ssi_probe(struct platform_device *pdev) 


	/* Error Interrupt */

	ssi->irq_int = platform_get_irq_byname(pdev, "int_req");

	if (ssi->irq_int < 0)

	if (ssi->irq_int < 0) {

		rz_ssi_release_dma_channels(ssi);

		return ssi->irq_int;

	}



	ret = devm_request_irq(&pdev->dev, ssi->irq_int, &rz_ssi_interrupt,

			       0, dev_name(&pdev->dev), ssi);

	if (ret < 0)

	if (ret < 0) {

		rz_ssi_release_dma_channels(ssi);

		return dev_err_probe(&pdev->dev, ret,

				     "irq request error (int_req)\n");

	}



	if (!rz_ssi_is_dma_enabled(ssi)) {

		/* Tx and Rx interrupts (pio only) */
@@ -1011,13 +1015,16 @@ static int rz_ssi_probe(struct platform_device *pdev) 
	}



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

	if (IS_ERR(ssi->rstc))

	if (IS_ERR(ssi->rstc)) {

		rz_ssi_release_dma_channels(ssi);

		return PTR_ERR(ssi->rstc);

	}



	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");