Unverified Commit 6ea460d5 authored by Lubomir Rintel's avatar Lubomir Rintel Committed by Mark Brown
Browse files

ASoC: mmp-sspa: Fix the error handling in probe() 



If we fail after pm_runtime_enable(), we fail to undo it. Same with
clk_prepare_enable(). Let's order them after all things that can fail.

Fixes: 7d98cc64 ("ASoC: mmp-sspa: Add support for the runtime power management")
Signed-off-by: default avatarLubomir Rintel <lkundrak@v3.sk>
Link: https://lore.kernel.org/r/20200520083516.2120802-1-lkundrak@v3.sk


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

sound/soc/pxa/mmp-sspa.c

+10 −6
Original line number Original line Diff line number Diff line
@@ -462,6 +462,7 @@ static const struct snd_soc_component_driver mmp_sspa_component = { 
static int asoc_mmp_sspa_probe(struct platform_device *pdev)

static int asoc_mmp_sspa_probe(struct platform_device *pdev)

{

{

	struct sspa_priv *sspa;

	struct sspa_priv *sspa;

	int ret;





	sspa = devm_kzalloc(&pdev->dev,

	sspa = devm_kzalloc(&pdev->dev,

				sizeof(struct sspa_priv), GFP_KERNEL);

				sizeof(struct sspa_priv), GFP_KERNEL);
@@ -514,8 +515,6 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev) 
			return PTR_ERR(sspa->sysclk);

			return PTR_ERR(sspa->sysclk);

		}

		}

	}

	}

	pm_runtime_enable(&pdev->dev);

	clk_prepare_enable(sspa->audio_clk);

	platform_set_drvdata(pdev, sspa);

	platform_set_drvdata(pdev, sspa);





	sspa->playback_dma_data.maxburst = 4;

	sspa->playback_dma_data.maxburst = 4;
@@ -525,16 +524,21 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev) 
	sspa->playback_dma_data.addr = 0x80 + SSPA_D;

	sspa->playback_dma_data.addr = 0x80 + SSPA_D;





	if (pdev->dev.of_node) {

	if (pdev->dev.of_node) {

		int ret;



		ret = devm_snd_dmaengine_pcm_register(&pdev->dev,

		ret = devm_snd_dmaengine_pcm_register(&pdev->dev,

						      &mmp_pcm_config, 0);

						      &mmp_pcm_config, 0);

		if (ret)

		if (ret)

			return ret;

			return ret;

	}

	}





	return devm_snd_soc_register_component(&pdev->dev, &mmp_sspa_component,

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

					      &mmp_sspa_dai, 1);

					      &mmp_sspa_dai, 1);

	if (ret)

		return ret;



	pm_runtime_enable(&pdev->dev);

	clk_prepare_enable(sspa->audio_clk);



	return 0;

}

}





static int asoc_mmp_sspa_remove(struct platform_device *pdev)

static int asoc_mmp_sspa_remove(struct platform_device *pdev)