ASoC: Fix multi-component mismerge in WM8523

broonie · broonie · commit f71a4734b1ad · 2010-11-22T20:27:49.000Z
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Acked-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,6 @@ static int wm8523_startup(struct snd_pcm_substream *substream,`
`146`	`146`	`return -EINVAL;`
`147`	`147`	`}`
`148`	`148`
`149`		`- return 0;`
`150`	`149`	`snd_pcm_hw_constraint_list(substream->runtime, 0,`
`151`	`150`	`SNDRV_PCM_HW_PARAM_RATE,`
`152`	`151`	`&wm8523->rate_constraint);`