ASoC: Fix merge issue with WM8962 control addition
Subsystems (3)
PATCH 1/1 ASoC: Fix merge issue with WM8962 control addition
Let's not add the core controls twice.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8962.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
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 · 1 line
1.7.1
Quoted 12 lines · Mark Brown
Let's not add the core controls twice.
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/wm8962.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)sound/soc/codecs/wm8962.c +0
-0
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);
Acked-by Liam Girdwood <[email protected]>
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk