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>
This commit is contained in:
Родитель
082100dc92
Коммит
13f808cf8d
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче