diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-30 10:36:23 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 08:08:40 -0500 |
commit | 748b217827974d34a7341142599f0db631a3e45a (patch) | |
tree | f81e43c72677779730491bfa22f1c8092c3ebfe9 /sound/soc | |
parent | c49c7f0cf91c8506d0a0ed61227a0da3b243384d (diff) |
ASoC: Fix return value of wm8580_set_sysclk()
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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm8580.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index b1c8d3de08b2..211285164d70 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c | |||
@@ -670,7 +670,7 @@ static int wm8580_set_sysclk(struct snd_soc_dai *dai, int clk_id, | |||
670 | { | 670 | { |
671 | struct snd_soc_codec *codec = dai->codec; | 671 | struct snd_soc_codec *codec = dai->codec; |
672 | struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); | 672 | struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); |
673 | int sel, sel_mask, sel_shift; | 673 | int ret, sel, sel_mask, sel_shift; |
674 | 674 | ||
675 | switch (dai->driver->id) { | 675 | switch (dai->driver->id) { |
676 | case WM8580_DAI_PAIFRX: | 676 | case WM8580_DAI_PAIFRX: |
@@ -711,7 +711,11 @@ static int wm8580_set_sysclk(struct snd_soc_dai *dai, int clk_id, | |||
711 | /* We really should validate PLL settings but not yet */ | 711 | /* We really should validate PLL settings but not yet */ |
712 | wm8580->sysclk[dai->driver->id] = freq; | 712 | wm8580->sysclk[dai->driver->id] = freq; |
713 | 713 | ||
714 | return snd_soc_update_bits(codec, WM8580_CLKSEL, sel_mask, sel); | 714 | ret = snd_soc_update_bits(codec, WM8580_CLKSEL, sel_mask, sel); |
715 | if (ret < 0) | ||
716 | return ret; | ||
717 | |||
718 | return 0; | ||
715 | } | 719 | } |
716 | 720 | ||
717 | static int wm8580_digital_mute(struct snd_soc_dai *codec_dai, int mute) | 721 | static int wm8580_digital_mute(struct snd_soc_dai *codec_dai, int mute) |