Skip to content

Commit

Permalink
ASoC: Revert missing reset_err in wm97*.c
Browse files Browse the repository at this point in the history
The commit fe3e78e
      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 <[email protected]>
  • Loading branch information
tiwai committed Nov 27, 2009
1 parent 74ea23a commit a22eaf4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions sound/soc/codecs/wm9705.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions sound/soc/codecs/wm9712.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 2 additions & 0 deletions sound/soc/codecs/wm9713.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit a22eaf4

Please sign in to comment.