Skip to content

Commit

Permalink
ASoC: mmp-sspa: Fix the error handling in probe()
Browse files Browse the repository at this point in the history
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: 7d98cc6 ("ASoC: mmp-sspa: Add support for the runtime power management")
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Link: https://lore.kernel.org/r/20200520083516.2120802-1-lkundrak@v3.sk
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Lubomir Rintel authored and Mark Brown committed May 20, 2020
1 parent d81bb87 commit 6ea460d
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions sound/soc/pxa/mmp-sspa.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ static const struct snd_soc_component_driver mmp_sspa_component = {
static int asoc_mmp_sspa_probe(struct platform_device *pdev)
{
struct sspa_priv *sspa;
int ret;

sspa = devm_kzalloc(&pdev->dev,
sizeof(struct sspa_priv), GFP_KERNEL);
Expand Down Expand Up @@ -514,8 +515,6 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev)
return PTR_ERR(sspa->sysclk);
}
}
pm_runtime_enable(&pdev->dev);
clk_prepare_enable(sspa->audio_clk);
platform_set_drvdata(pdev, sspa);

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

if (pdev->dev.of_node) {
int ret;

ret = devm_snd_dmaengine_pcm_register(&pdev->dev,
&mmp_pcm_config, 0);
if (ret)
return ret;
}

return devm_snd_soc_register_component(&pdev->dev, &mmp_sspa_component,
&mmp_sspa_dai, 1);
ret = devm_snd_soc_register_component(&pdev->dev, &mmp_sspa_component,
&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)
Expand Down

0 comments on commit 6ea460d

Please sign in to comment.