From 13f808cf8ddb5f3ca0f0271473c6c02a4b32580b Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 20 Sep 2010 19:17:44 +0100 Subject: [PATCH] ASoC: Fix merge issue with WM8962 control addition Let's not add the core controls twice. Signed-off-by: Mark Brown Acked-by: Liam Girdwood --- sound/soc/codecs/wm8962.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 30984dd15c48..7de519479801 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);