[alsa-devel] [PATCH] ASoC: Fix multi-component mismerge in WM8523

[Liam Girdwood]

On Mon, 2010-11-22 at 19:12 +0000, Mark Brown wrote:
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  sound/soc/codecs/wm8523.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
> index d331888..bf44ec7 100644
> --- a/sound/soc/codecs/wm8523.c
> +++ b/sound/soc/codecs/wm8523.c
> @@ -147,7 +147,6 @@ static int wm8523_startup(struct snd_pcm_substream *substream,
>  		return -EINVAL;
>  	}
>  
> -	return 0;
>  	snd_pcm_hw_constraint_list(substream->runtime, 0,
>  				   SNDRV_PCM_HW_PARAM_RATE,
>  				   &wm8523->rate_constraint);

Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk