Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a22eaf4c authored Nov 27, 2009 by Takashi Iwai

ASoC: Revert missing reset_err in wm97*.c



The commit fe3e78e0
      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>

parent 74ea23aa

sound/soc/codecs/wm9705.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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:

sound/soc/codecs/wm9712.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);

sound/soc/codecs/wm9713.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);