From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 20 Sep 2010 18:17:44 +0000 (+0100)
Subject: ASoC: Fix merge issue with WM8962 control addition
X-Git-Tag: v3.0~832^2~32^2~529
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13f808cf8ddb5f3ca0f0271473c6c02a4b32580b;p=platform%2Fkernel%2Flinux-amlogic.git

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 30984dd..7de5194 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);