| commit | 07ad822c213d2d0d1a9c26fd06c85a60f62c194d | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Sun Nov 03 22:04:18 2013 -0800 |
| committer | Mark Brown <broonie@linaro.org> | Sun Nov 03 22:04:18 2013 -0800 |
| tree | 82a044217fce639744893221ac88c0472bf6b378 | |
| parent | fc10c6db770b84dde1855b3155cf39b7a0373fbb [diff] | |
| parent | 8b4b30365ce6cefe4193f439ac7263bb2cdd66fd [diff] |
Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-next
diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c index 2611882..185fa3bc 100644 --- a/sound/soc/codecs/ml26124.c +++ b/sound/soc/codecs/ml26124.c
@@ -342,6 +342,8 @@ 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);