summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8962.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-20 19:17:44 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-21 10:18:02 +0100
commit13f808cf8ddb5f3ca0f0271473c6c02a4b32580b (patch)
treebfd903966c876c32ffc3907dcc2ff67633d4b7df /sound/soc/codecs/wm8962.c
parent082100dc9210449dac8ad8c7d20180cc1a0c319d (diff)
ASoC: Fix merge issue with WM8962 control addition
Let's not add the core controls twice. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
-rw-r--r--sound/soc/codecs/wm8962.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 30984dd15c48..7de519479801 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -1744,8 +1744,6 @@ static int wm8962_probe(struct snd_soc_codec *codec)
wm8962->reg_cache[WM8962_HPOUTL_VOLUME] |= WM8962_HPOUT_VU;
wm8962->reg_cache[WM8962_HPOUTR_VOLUME] |= WM8962_HPOUT_VU;
- snd_soc_add_controls(codec, wm8962_snd_controls,
- ARRAY_SIZE(wm8962_snd_controls));
wm8962_add_widgets(codec);
wm8962_init_beep(codec);