Skip to contentSkip to conversation

ASoC: Fix merge issue with WM8962 control addition

PATCH In review Mark Brown 2 participants 2 messages Sep 20, 2010 – Sep 21, 2010

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ASoC: Fix merge issue with WM8962 control addition

Let's not add the core controls twice.

---
 sound/soc/codecs/wm8962.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8962.c +0 -2
index 28adc6c..c4deea1 100644
@@ -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);
Signature · 1 line
1.7.1
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Mark Brown

Let's not add the core controls twice.

---
 sound/soc/codecs/wm8962.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8962.c +0 -0
index 28adc6c..c4deea1 100644

sound/soc/codecs/wm8962.c static int wm8962_probe(struct snd_soc_codec *codec) · line 1850

Quoted 8 lines
sound/soc/codecs/wm8962.c +0 -2
@@ -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);
Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk