Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13f808cf authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Fix merge issue with WM8962 control addition 



Let's not add the core controls twice.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 082100dc

sound/soc/codecs/wm8962.c

+0 −2
Original line number Diff line number Diff line
@@ -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);