diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 20:11:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 21:27:49 +0100 |
| commit | f71a4734b1ad7edccbfd9bd395df328ebbd94287 (patch) | |
| tree | 80f46fb70b96a599594da114a3dac85a4a234ccb /sound/soc/codecs/wm8523.c | |
| parent | ASoC: atmel: test wrong variable (diff) | |
| download | linux-f71a4734b1ad7edccbfd9bd395df328ebbd94287.tar.xz linux-f71a4734b1ad7edccbfd9bd395df328ebbd94287.zip | |
ASoC: Fix multi-component mismerge in WM8523
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/codecs/wm8523.c')
| -rw-r--r-- | 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 712ef7c76f90..9a433a5396cb 100644 --- a/sound/soc/codecs/wm8523.c +++ b/sound/soc/codecs/wm8523.c @@ -146,7 +146,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); |