Prechádzať zdrojové kódy

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>
Takashi Iwai 15 rokov pred
rodič
commit
a22eaf4ce1

+ 2 - 0
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:

+ 2 - 0
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);
 

+ 2 - 0
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);