aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-03 22:04:18 -0800
committerMark Brown <broonie@linaro.org>2013-11-03 22:04:18 -0800
commit07ad822c213d2d0d1a9c26fd06c85a60f62c194d (patch)
tree82a044217fce639744893221ac88c0472bf6b378
parentfc10c6db770b84dde1855b3155cf39b7a0373fbb (diff)
parent8b4b30365ce6cefe4193f439ac7263bb2cdd66fd (diff)
Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-next
-rw-r--r--sound/soc/codecs/ml26124.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c
index 26118828782b..185fa3bc3052 100644
--- 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);

Privacy Policy