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>

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 30984dd15c4878dbbd41f4fe5e03a44b050a1fd7..7de519479801c0f828ff1963b0fb09d5d61542fc 100644 (file)
--- 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);