diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-23 18:39:47 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-23 18:39:47 +0200 |
| commit | cff7873554eedc044029c41a9fd694245d97eff8 (patch) | |
| tree | 453024605141ed884277e40d55f2b7e62b5b919c /sound/soc/codecs/cs42l73.c | |
| parent | 5ac57550f279c3d991ef0b398681bcaca18169f7 (diff) | |
| parent | 1a38336b8611a04f0a624330c1f815421f4bf5f4 (diff) | |
| download | talos-obmc-linux-cff7873554eedc044029c41a9fd694245d97eff8.tar.gz talos-obmc-linux-cff7873554eedc044029c41a9fd694245d97eff8.zip | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: updates for 3.4
Slightly larger than normal - the DAPM fix is a "this should always have
worked" type of thing which is very clear and should have no impact on
systems that don't need it. The WM8994 fix is driver specific but
pretty important for that driver.
Diffstat (limited to 'sound/soc/codecs/cs42l73.c')
| -rw-r--r-- | sound/soc/codecs/cs42l73.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 78979b3e0e95..07c44b71f096 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -929,6 +929,8 @@ static int cs42l73_set_mclk(struct snd_soc_dai *dai, unsigned int freq) /* MCLKX -> MCLK */ mclkx_coeff = cs42l73_get_mclkx_coeff(freq); + if (mclkx_coeff < 0) + return mclkx_coeff; mclk = cs42l73_mclkx_coeffs[mclkx_coeff].mclkx / cs42l73_mclkx_coeffs[mclkx_coeff].ratio; |
