* [PATCH] ASoC: Atmel: ClassD: unregister codec when error occurs
@ 2015-12-11 3:07 Songjun Wu
2015-12-15 9:11 ` Nicolas Ferre
0 siblings, 1 reply; 2+ messages in thread
From: Songjun Wu @ 2015-12-11 3:07 UTC (permalink / raw)
To: linux-arm-kernel
Add code to unregister codec in probe function,
when the error occurs after the codec is registered.
Signed-off-by: Songjun Wu <songjun.wu@atmel.com>
---
sound/soc/atmel/atmel-classd.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index dca6141..6107de9 100644
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -640,8 +640,10 @@ static int atmel_classd_probe(struct platform_device *pdev)
/* register sound card */
card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
- if (!card)
- return -ENOMEM;
+ if (!card) {
+ ret = -ENOMEM;
+ goto unregister_codec;
+ }
snd_soc_card_set_drvdata(card, dd);
platform_set_drvdata(pdev, card);
@@ -649,16 +651,20 @@ static int atmel_classd_probe(struct platform_device *pdev)
ret = atmel_classd_asoc_card_init(dev, card);
if (ret) {
dev_err(dev, "failed to init sound card\n");
- return ret;
+ goto unregister_codec;
}
ret = devm_snd_soc_register_card(dev, card);
if (ret) {
dev_err(dev, "failed to register sound card: %d\n", ret);
- return ret;
+ goto unregister_codec;
}
return 0;
+
+unregister_codec:
+ snd_soc_unregister_codec(dev);
+ return ret;
}
static int atmel_classd_remove(struct platform_device *pdev)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] ASoC: Atmel: ClassD: unregister codec when error occurs
2015-12-11 3:07 [PATCH] ASoC: Atmel: ClassD: unregister codec when error occurs Songjun Wu
@ 2015-12-15 9:11 ` Nicolas Ferre
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Ferre @ 2015-12-15 9:11 UTC (permalink / raw)
To: linux-arm-kernel
Le 11/12/2015 04:07, Songjun Wu a ?crit :
> Add code to unregister codec in probe function,
> when the error occurs after the codec is registered.
>
> Signed-off-by: Songjun Wu <songjun.wu@atmel.com>
Seems okay:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Thanks,
> ---
>
> sound/soc/atmel/atmel-classd.c | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
> index dca6141..6107de9 100644
> --- a/sound/soc/atmel/atmel-classd.c
> +++ b/sound/soc/atmel/atmel-classd.c
> @@ -640,8 +640,10 @@ static int atmel_classd_probe(struct platform_device *pdev)
>
> /* register sound card */
> card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
> - if (!card)
> - return -ENOMEM;
> + if (!card) {
> + ret = -ENOMEM;
> + goto unregister_codec;
> + }
>
> snd_soc_card_set_drvdata(card, dd);
> platform_set_drvdata(pdev, card);
> @@ -649,16 +651,20 @@ static int atmel_classd_probe(struct platform_device *pdev)
> ret = atmel_classd_asoc_card_init(dev, card);
> if (ret) {
> dev_err(dev, "failed to init sound card\n");
> - return ret;
> + goto unregister_codec;
> }
>
> ret = devm_snd_soc_register_card(dev, card);
> if (ret) {
> dev_err(dev, "failed to register sound card: %d\n", ret);
> - return ret;
> + goto unregister_codec;
> }
>
> return 0;
> +
> +unregister_codec:
> + snd_soc_unregister_codec(dev);
> + return ret;
> }
>
> static int atmel_classd_remove(struct platform_device *pdev)
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-15 9:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-11 3:07 [PATCH] ASoC: Atmel: ClassD: unregister codec when error occurs Songjun Wu
2015-12-15 9:11 ` Nicolas Ferre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).