diff options
Diffstat (limited to 'sound/soc/codecs/wm9712.c')
-rw-r--r-- | sound/soc/codecs/wm9712.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 1fd4e88f50cf..0ac1215dcd9b 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c | |||
@@ -436,7 +436,6 @@ static int wm9712_add_widgets(struct snd_soc_codec *codec) | |||
436 | 436 | ||
437 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 437 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); |
438 | 438 | ||
439 | snd_soc_dapm_new_widgets(codec); | ||
440 | return 0; | 439 | return 0; |
441 | } | 440 | } |
442 | 441 | ||
@@ -695,17 +694,11 @@ static int wm9712_soc_probe(struct platform_device *pdev) | |||
695 | snd_soc_add_controls(codec, wm9712_snd_ac97_controls, | 694 | snd_soc_add_controls(codec, wm9712_snd_ac97_controls, |
696 | ARRAY_SIZE(wm9712_snd_ac97_controls)); | 695 | ARRAY_SIZE(wm9712_snd_ac97_controls)); |
697 | wm9712_add_widgets(codec); | 696 | wm9712_add_widgets(codec); |
698 | ret = snd_soc_init_card(socdev); | ||
699 | if (ret < 0) { | ||
700 | printk(KERN_ERR "wm9712: failed to register card\n"); | ||
701 | goto reset_err; | ||
702 | } | ||
703 | 697 | ||
704 | return 0; | 698 | return 0; |
705 | 699 | ||
706 | reset_err: | 700 | reset_err: |
707 | snd_soc_free_pcms(socdev); | 701 | snd_soc_free_pcms(socdev); |
708 | |||
709 | pcm_err: | 702 | pcm_err: |
710 | snd_soc_free_ac97_codec(codec); | 703 | snd_soc_free_ac97_codec(codec); |
711 | 704 | ||