diff options
Diffstat (limited to 'sound/soc/codecs/wm9713.c')
-rw-r--r-- | sound/soc/codecs/wm9713.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 60e360b10468..c58aab375edb 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c | |||
@@ -625,7 +625,6 @@ static int wm9713_add_widgets(struct snd_soc_codec *codec) | |||
625 | 625 | ||
626 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 626 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); |
627 | 627 | ||
628 | snd_soc_dapm_new_widgets(codec); | ||
629 | return 0; | 628 | return 0; |
630 | } | 629 | } |
631 | 630 | ||
@@ -800,8 +799,8 @@ static int wm9713_set_pll(struct snd_soc_codec *codec, | |||
800 | return 0; | 799 | return 0; |
801 | } | 800 | } |
802 | 801 | ||
803 | static int wm9713_set_dai_pll(struct snd_soc_dai *codec_dai, | 802 | static int wm9713_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, |
804 | int pll_id, unsigned int freq_in, unsigned int freq_out) | 803 | int source, unsigned int freq_in, unsigned int freq_out) |
805 | { | 804 | { |
806 | struct snd_soc_codec *codec = codec_dai->codec; | 805 | struct snd_soc_codec *codec = codec_dai->codec; |
807 | return wm9713_set_pll(codec, pll_id, freq_in, freq_out); | 806 | return wm9713_set_pll(codec, pll_id, freq_in, freq_out); |
@@ -1247,14 +1246,11 @@ static int wm9713_soc_probe(struct platform_device *pdev) | |||
1247 | snd_soc_add_controls(codec, wm9713_snd_ac97_controls, | 1246 | snd_soc_add_controls(codec, wm9713_snd_ac97_controls, |
1248 | ARRAY_SIZE(wm9713_snd_ac97_controls)); | 1247 | ARRAY_SIZE(wm9713_snd_ac97_controls)); |
1249 | wm9713_add_widgets(codec); | 1248 | wm9713_add_widgets(codec); |
1250 | ret = snd_soc_init_card(socdev); | 1249 | |
1251 | if (ret < 0) | ||
1252 | goto reset_err; | ||
1253 | return 0; | 1250 | return 0; |
1254 | 1251 | ||
1255 | reset_err: | 1252 | reset_err: |
1256 | snd_soc_free_pcms(socdev); | 1253 | snd_soc_free_pcms(socdev); |
1257 | |||
1258 | pcm_err: | 1254 | pcm_err: |
1259 | snd_soc_free_ac97_codec(codec); | 1255 | snd_soc_free_ac97_codec(codec); |
1260 | 1256 | ||