diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:31 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:31 -0500 |
| commit | 672922e975106b2a57cf3f4ba68405e4e5e700cc (patch) | |
| tree | b50aa643d35937a3cd66efe97384cbc88b3cc32a | |
| parent | efdf09add98821380794a3318270bf07c7aff4d2 (diff) | |
| parent | 8b4b30365ce6cefe4193f439ac7263bb2cdd66fd (diff) | |
Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-next
| -rw-r--r-- | sound/soc/codecs/ml26124.c | 2 |
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, | |||
| 342 | struct ml26124_priv *priv = snd_soc_codec_get_drvdata(codec); | 342 | struct ml26124_priv *priv = snd_soc_codec_get_drvdata(codec); |
| 343 | int i = get_coeff(priv->mclk, params_rate(hw_params)); | 343 | int i = get_coeff(priv->mclk, params_rate(hw_params)); |
| 344 | 344 | ||
| 345 | if (i < 0) | ||
| 346 | return i; | ||
| 345 | priv->substream = substream; | 347 | priv->substream = substream; |
| 346 | priv->rate = params_rate(hw_params); | 348 | priv->rate = params_rate(hw_params); |
| 347 | 349 | ||