FYI,
I committed the fix below to topic/asoc branch now.
thanks,
Takashi
===
>From a22eaf4ce106404f6c5283da30b4d514ede964c1 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri, 27 Nov 2009 15:14:09 +0100
Subject: [PATCH] ASoC: Revert missing reset_err in wm97*.c
The commit fe3e78e073d25308756f38019956061153267769
ASoC: Factor out snd_soc_init_card()
removed the error paths that are still valid for wm97* codecs, causing
the compile errors like
sound/soc/codecs/wm9705.c:399: error: label 'reset_err' used but not defined
sound/soc/codecs/wm9712.c:687: error: label 'reset_err' used but not defined
sound/soc/codecs/wm9713.c:1237: error: label 'reset_err' used but not defined
Revert the removed error path codes.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
---
sound/soc/codecs/wm9705.c | 2 ++
sound/soc/codecs/wm9712.c | 2 ++
sound/soc/codecs/wm9713.c | 2 ++
3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c
index dfffc6c..ec54c6d 100644
--- a/sound/soc/codecs/wm9705.c
+++ b/sound/soc/codecs/wm9705.c
@@ -404,6 +404,8 @@ static int wm9705_soc_probe(struct platform_device *pdev)
return 0;
+reset_err:
+ snd_soc_free_pcms(socdev);
pcm_err:
snd_soc_free_ac97_codec(codec);
codec_err:
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 2a08722..0ac1215 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -697,6 +697,8 @@ static int wm9712_soc_probe(struct platform_device *pdev)
return 0;
+reset_err:
+ snd_soc_free_pcms(socdev);
pcm_err:
snd_soc_free_ac97_codec(codec);
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index 00bac31..4d74ecb 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1249,6 +1249,8 @@ static int wm9713_soc_probe(struct platform_device *pdev)
return 0;
+reset_err:
+ snd_soc_free_pcms(socdev);
pcm_err:
snd_soc_free_ac97_codec(codec);
--
1.6.5.3
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
