* [PATCH] ASoC: Atmel: ClassD: unregister codec when error occurs
@ 2015-12-11 3:07 ` Songjun Wu
0 siblings, 0 replies; 7+ messages in thread
From: Songjun Wu @ 2015-12-11 3:07 UTC (permalink / raw)
To: broonie, nicolas.ferre
Cc: linux-arm-kernel, Songjun Wu, Liam Girdwood, Jaroslav Kysela,
Takashi Iwai, alsa-devel, linux-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] 7+ messages in thread* [PATCH] ASoC: Atmel: ClassD: unregister codec when error occurs
@ 2015-12-11 3:07 ` Songjun Wu
0 siblings, 0 replies; 7+ 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] 7+ messages in thread* Applied "ASoC: Atmel: ClassD: unregister codec when error occurs" to the asoc tree
2015-12-11 3:07 ` Songjun Wu
(?)
(?)
@ 2015-12-12 23:07 ` Mark Brown
-1 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2015-12-12 23:07 UTC (permalink / raw)
To: Songjun Wu, Mark Brown; +Cc: alsa-devel
The patch
ASoC: Atmel: ClassD: unregister codec when error occurs
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 32e69bad8ed9ed4e1bf1fd8217b61d5f87996253 Mon Sep 17 00:00:00 2001
From: Songjun Wu <songjun.wu@atmel.com>
Date: Fri, 11 Dec 2015 11:07:37 +0800
Subject: [PATCH] ASoC: Atmel: ClassD: unregister codec when error occurs
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
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 8276675..f3ffb39 100644
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -636,8 +636,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);
@@ -645,16 +647,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)
--
2.6.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] ASoC: Atmel: ClassD: unregister codec when error occurs
2015-12-11 3:07 ` Songjun Wu
(?)
@ 2015-12-15 9:11 ` Nicolas Ferre
-1 siblings, 0 replies; 7+ messages in thread
From: Nicolas Ferre @ 2015-12-15 9:11 UTC (permalink / raw)
To: Songjun Wu, broonie
Cc: linux-arm-kernel, Liam Girdwood, Jaroslav Kysela, Takashi Iwai,
alsa-devel, linux-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] 7+ messages in thread* Re: [PATCH] ASoC: Atmel: ClassD: unregister codec when error occurs
@ 2015-12-15 9:11 ` Nicolas Ferre
0 siblings, 0 replies; 7+ messages in thread
From: Nicolas Ferre @ 2015-12-15 9:11 UTC (permalink / raw)
To: Songjun Wu, broonie
Cc: linux-arm-kernel, Liam Girdwood, Jaroslav Kysela, Takashi Iwai,
alsa-devel, linux-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] 7+ messages in thread* [PATCH] ASoC: Atmel: ClassD: unregister codec when error occurs
@ 2015-12-15 9:11 ` Nicolas Ferre
0 siblings, 0 replies; 7+ 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] 7+ messages in thread