]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ASoC: Fix multi-component mismerge in WM8523
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Nov 2010 19:11:48 +0000 (19:11 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Nov 2010 20:27:49 +0000 (20:27 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
sound/soc/codecs/wm8523.c

index 712ef7c76f90bbde579229ea85716dd14f7acb10..9a433a5396cb781727e39a4c1c6005f1bbc9a421 100644 (file)
@@ -146,7 +146,6 @@ static int wm8523_startup(struct snd_pcm_substream *substream,
                return -EINVAL;
        }
 
                return -EINVAL;
        }
 
-       return 0;
        snd_pcm_hw_constraint_list(substream->runtime, 0,
                                   SNDRV_PCM_HW_PARAM_RATE,
                                   &wm8523->rate_constraint);
        snd_pcm_hw_constraint_list(substream->runtime, 0,
                                   SNDRV_PCM_HW_PARAM_RATE,
                                   &wm8523->rate_constraint);