From 6caab68d8ddea29c966abbbea9e160d3ceb3edc5 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 8 Dec 2011 16:52:19 +0800 Subject: [PATCH] --- yaml --- r: 283910 b: refs/heads/master c: 5a374524216a244d30c42545ab49f743a43b05c7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8804.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 09087a46a73c..a0ab36fb7804 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc9c040d363f3be17a59024191e9400e5b6205ae +refs/heads/master: 5a374524216a244d30c42545ab49f743a43b05c7 diff --git a/trunk/sound/soc/codecs/wm8804.c b/trunk/sound/soc/codecs/wm8804.c index ae4b8fb3c3e5..d54a3ca5e19e 100644 --- a/trunk/sound/soc/codecs/wm8804.c +++ b/trunk/sound/soc/codecs/wm8804.c @@ -659,8 +659,6 @@ static int wm8804_probe(struct snd_soc_codec *codec) wm8804_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - snd_soc_add_controls(codec, wm8804_snd_controls, - ARRAY_SIZE(wm8804_snd_controls)); return 0; err_reg_enable: @@ -715,7 +713,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8804 = { .reg_cache_size = ARRAY_SIZE(wm8804_reg_defs), .reg_word_size = sizeof(u8), .reg_cache_default = wm8804_reg_defs, - .volatile_register = wm8804_volatile + .volatile_register = wm8804_volatile, + + .controls = wm8804_snd_controls, + .num_controls = ARRAY_SIZE(wm8804_snd_controls), }; static const struct of_device_id wm8804_of_match[] = {