summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/ml26124.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-15 14:20:08 +0400
committerMark Brown <broonie@linaro.org>2013-11-15 14:20:08 +0400
commit514918f0d1c3e7cf78fe2acbe80f7b616065e210 (patch)
treef6a918d115acf0347ee69b2b90aada657a68ef96 /sound/soc/codecs/ml26124.c
parent9450d92c8c647752586eeeb7927da8a50a691c96 (diff)
parentfc7dc61d9a87011aaf8a6eb3144ebf9552adf5d2 (diff)
downloadlinux-514918f0d1c3e7cf78fe2acbe80f7b616065e210.tar.xz
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/ml26124.c')
-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);