Commit 28103509 authored by Mark Brown's avatar Mark Brown

ASoC: atmel: Fix error handling in at91samg20ek probe()

The error handling in the AT91SAM9G20-EK machine driver probe did not
consistently free the SSC in error paths, sometimes immediately returning
an error rather than doing cleanup. Fix this.
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
Link: https://lore.kernel.org/r/20220325154241.1600757-3-broonie@kernel.org
parent c775cbf6
...@@ -148,7 +148,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) ...@@ -148,7 +148,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
codec_np = of_parse_phandle(np, "atmel,audio-codec", 0); codec_np = of_parse_phandle(np, "atmel,audio-codec", 0);
if (!codec_np) { if (!codec_np) {
dev_err(&pdev->dev, "codec info missing\n"); dev_err(&pdev->dev, "codec info missing\n");
return -EINVAL; ret = -EINVAL;
goto err;
} }
at91sam9g20ek_dai.codecs->of_node = codec_np; at91sam9g20ek_dai.codecs->of_node = codec_np;
...@@ -159,7 +160,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) ...@@ -159,7 +160,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
if (!cpu_np) { if (!cpu_np) {
dev_err(&pdev->dev, "dai and pcm info missing\n"); dev_err(&pdev->dev, "dai and pcm info missing\n");
of_node_put(codec_np); of_node_put(codec_np);
return -EINVAL; ret = -EINVAL;
goto err;
} }
at91sam9g20ek_dai.cpus->of_node = cpu_np; at91sam9g20ek_dai.cpus->of_node = cpu_np;
at91sam9g20ek_dai.platforms->of_node = cpu_np; at91sam9g20ek_dai.platforms->of_node = cpu_np;
...@@ -170,9 +172,10 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) ...@@ -170,9 +172,10 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
ret = snd_soc_register_card(card); ret = snd_soc_register_card(card);
if (ret) { if (ret) {
dev_err(&pdev->dev, "snd_soc_register_card() failed\n"); dev_err(&pdev->dev, "snd_soc_register_card() failed\n");
goto err;
} }
return ret; return 0;
err: err:
atmel_ssc_put_audio(0); atmel_ssc_put_audio(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment