evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: Fix return value of wm8580_set_sysclk()

Browse source 
We can't just pass back the return value of snd_soc_update_bits() as it
will be 1 if a bit changed rather than zero.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2011-12-30 23:36:23 +08:00 • committed by Mark Brown
parent c49c7f0cf9
commit 748b217827
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/codecs/wm8580.c
View file

@ -670,7 +670,7 @@ static int wm8580_set_sysclk(struct snd_soc_dai *dai, int clk_id,
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
int sel, sel_mask, sel_shift; int ret, sel, sel_mask, sel_shift;
switch (dai->driver->id) { switch (dai->driver->id) {
case WM8580_DAI_PAIFRX: case WM8580_DAI_PAIFRX:
@ -711,7 +711,11 @@ static int wm8580_set_sysclk(struct snd_soc_dai *dai, int clk_id,
/* We really should validate PLL settings but not yet */ /* We really should validate PLL settings but not yet */
wm8580->sysclk[dai->driver->id] = freq; wm8580->sysclk[dai->driver->id] = freq;
return snd_soc_update_bits(codec, WM8580_CLKSEL, sel_mask, sel); ret = snd_soc_update_bits(codec, WM8580_CLKSEL, sel_mask, sel);
if (ret < 0)
return ret;
return 0;
} }
static int wm8580_digital_mute(struct snd_soc_dai *codec_dai, int mute) static int wm8580_digital_mute(struct snd_soc_dai *codec_dai, int mute)