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

mariux64 · Nov 4, 2013 · 07ad822 · 07ad822
2 parents fc10c6d + 8b4b303
commit 07ad822
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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);