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

07ad822c · Mark Brown · fc10c6db · 8b4b3036 · 07ad822c
Commit 07ad822c authored Nov 03, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sound/soc/codecs/ml26124.c sound/soc/codecs/ml26124.c +2 -0

No files found.
--- 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);