* [PATCH] ASoC: Fix merge issue with WM8962 control addition
@ 2010-09-20 18:27 Mark Brown
2010-09-21 13:06 ` Liam Girdwood
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2010-09-20 18:27 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
Let's not add the core controls twice.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm8962.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 28adc6c..c4deea1 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -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);
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: Fix merge issue with WM8962 control addition
2010-09-20 18:27 [PATCH] ASoC: Fix merge issue with WM8962 control addition Mark Brown
@ 2010-09-21 13:06 ` Liam Girdwood
0 siblings, 0 replies; 2+ messages in thread
From: Liam Girdwood @ 2010-09-21 13:06 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, patches
On Mon, 2010-09-20 at 19:27 +0100, Mark Brown wrote:
> Let's not add the core controls twice.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> sound/soc/codecs/wm8962.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
> index 28adc6c..c4deea1 100644
> --- a/sound/soc/codecs/wm8962.c
> +++ b/sound/soc/codecs/wm8962.c
> @@ -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 <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-21 13:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-20 18:27 [PATCH] ASoC: Fix merge issue with WM8962 control addition Mark Brown
2010-09-21 13:06 ` Liam Girdwood
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.