ASoC: Fix multi-component mismerge in WM8523



Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

parent b3915d1f

sound/soc/codecs/wm8523.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);