diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-04 10:05:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-11-04 10:05:07 +0100 |
| commit | ebfe1068f9ca4d0f25beca7a65d652380c40f226 (patch) | |
| tree | 109cfece95e42345d915c4c13e3bb1697ff02f65 /sound/soc/codecs/ml26124.c | |
| parent | 023838542dc8a4eac9650f98942671078a4ce73d (diff) | |
| parent | 71d0c3a876e007f68fc2ed433119dd4f4dc408a7 (diff) | |
Merge tag 'asoc-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Final updates for v3.13
A few final updates for v3.13, all driver updates apart from some DPCM
and Coverity fixes which should have minor impact on practical systems.
Diffstat (limited to 'sound/soc/codecs/ml26124.c')
| -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, 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); |