Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-next

2013-11-08 10:43:31 +00:00 · 2013-11-08 10:43:31 +00:00 · 672922e975
parent efdf09add9 8b4b30365c
commit 672922e975
1 changed files with 2 additions and 0 deletions
--- a/sound/soc/codecs/ml26124.c
+++ b/sound/soc/codecs/ml26124.c
@ -342,6 +342,8 @@ static int ml26124_hw_params(struct snd_pcm_substream *substream,
 	struct ml26124_priv *priv = snd_soc_codec_get_drvdata(codec);
 	int i = get_coeff(priv->mclk, params_rate(hw_params));

+	if (i < 0)
+		return i;
 	priv->substream = substream;
 	priv->rate = params_rate(hw_params);