[alsa-devel] [PATCH] ASoC: Fix merge issue with WM8962 control addition

[Mark Brown]

Let's not add the core controls twice.

Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
---
 sound/soc/codecs/wm8962.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 28adc6c..c4deea1 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -1845,8 +1845,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);
-- 
1.7.1