aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-11-27 09:14:09 -0500
committerTakashi Iwai <tiwai@suse.de>2009-11-27 09:14:09 -0500
commita22eaf4ce106404f6c5283da30b4d514ede964c1 (patch)
tree51ad476c79891cf34709acf12c5728c5857aae7d
parent74ea23aa6c9a8bece71b35ddeeb7ad6ae6782cd9 (diff)
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@suse.de>
-rw-r--r--sound/soc/codecs/wm9705.c2
-rw-r--r--sound/soc/codecs/wm9712.c2
-rw-r--r--sound/soc/codecs/wm9713.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c
index dfffc6c778c0..ec54c6da9856 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)
404 404
405 return 0; 405 return 0;
406 406
407reset_err:
408 snd_soc_free_pcms(socdev);
407pcm_err: 409pcm_err:
408 snd_soc_free_ac97_codec(codec); 410 snd_soc_free_ac97_codec(codec);
409codec_err: 411codec_err:
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 2a0872273007..0ac1215dcd9b 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)
697 697
698 return 0; 698 return 0;
699 699
700reset_err:
701 snd_soc_free_pcms(socdev);
700pcm_err: 702pcm_err:
701 snd_soc_free_ac97_codec(codec); 703 snd_soc_free_ac97_codec(codec);
702 704
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index 00bac315fb3b..4d74ecb0e56b 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)
1249 1249
1250 return 0; 1250 return 0;
1251 1251
1252reset_err:
1253 snd_soc_free_pcms(socdev);
1252pcm_err: 1254pcm_err:
1253 snd_soc_free_ac97_codec(codec); 1255 snd_soc_free_ac97_codec(codec);
1254 1256