aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/codecs/wm9712.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index c389e5607ab6..f3aab6e1d92a 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -647,8 +647,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
647 ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000); 647 ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000);
648 648
649 wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY); 649 wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
650 snd_soc_add_codec_controls(codec, wm9712_snd_ac97_controls,
651 ARRAY_SIZE(wm9712_snd_ac97_controls));
652 650
653 return 0; 651 return 0;
654 652
@@ -675,6 +673,9 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9712 = {
675 .reg_word_size = sizeof(u16), 673 .reg_word_size = sizeof(u16),
676 .reg_cache_step = 2, 674 .reg_cache_step = 2,
677 .reg_cache_default = wm9712_reg, 675 .reg_cache_default = wm9712_reg,
676
677 .controls = wm9712_snd_ac97_controls,
678 .num_controls = ARRAY_SIZE(wm9712_snd_ac97_controls),
678 .dapm_widgets = wm9712_dapm_widgets, 679 .dapm_widgets = wm9712_dapm_widgets,
679 .num_dapm_widgets = ARRAY_SIZE(wm9712_dapm_widgets), 680 .num_dapm_widgets = ARRAY_SIZE(wm9712_dapm_widgets),
680 .dapm_routes = wm9712_audio_map, 681 .dapm_routes = wm9712_audio_map,