From af7cc25d1a9c90af2004b7fd70a4627671d0401a Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 3 Dec 2011 11:47:23 +0000 Subject: [PATCH] --- yaml --- r: 283873 b: refs/heads/master c: 2f5374d8cf05d8b71f593633bf20972102f591c6 h: refs/heads/master i: 283871: c6580a3794a4e16a9bbe53e5d6488dd05fb0cc53 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8711.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2ade5f3a1b8c..41c269f3c473 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f185e3f8b06c1d0fd817af3d4c03f9c21d776e9 +refs/heads/master: 2f5374d8cf05d8b71f593633bf20972102f591c6 diff --git a/trunk/sound/soc/codecs/wm8711.c b/trunk/sound/soc/codecs/wm8711.c index b9b1a2f8360f..0b76d1dca5ea 100644 --- a/trunk/sound/soc/codecs/wm8711.c +++ b/trunk/sound/soc/codecs/wm8711.c @@ -374,9 +374,6 @@ static int wm8711_probe(struct snd_soc_codec *codec) snd_soc_update_bits(codec, WM8711_LOUT1V, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8711_ROUT1V, 0x0100, 0x0100); - snd_soc_add_controls(codec, wm8711_snd_controls, - ARRAY_SIZE(wm8711_snd_controls)); - return ret; } @@ -397,6 +394,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8711 = { .reg_cache_size = ARRAY_SIZE(wm8711_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8711_reg, + .controls = wm8711_snd_controls, + .num_controls = ARRAY_SIZE(wm8711_snd_controls), .dapm_widgets = wm8711_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(wm8711_dapm_widgets), .dapm_routes = wm8711_intercon,