lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Host clock2 read up in WM8904 FLL configuration

Browse Source 
Avoids skipping over the read for disable cases.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown
2009-12-18 14:20:35 +00:00
parent a17accb7ae
commit 18240b67c8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/wm8904.c
View File

@@ -1893,6 +1893,8 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
Fout == wm8904->fll_fout) Fout == wm8904->fll_fout)
return 0; return 0;
clock2 = snd_soc_read(codec, WM8904_CLOCK_RATES_2);
if (Fout == 0) { if (Fout == 0) {
dev_dbg(codec->dev, "FLL disabled\n"); dev_dbg(codec->dev, "FLL disabled\n");
@@ -1936,7 +1938,6 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
/* Save current state then disable the FLL and SYSCLK to avoid /* Save current state then disable the FLL and SYSCLK to avoid
* misclocking */ * misclocking */
clock2 = snd_soc_read(codec, WM8904_CLOCK_RATES_2);
fll1 = snd_soc_read(codec, WM8904_FLL_CONTROL_1); fll1 = snd_soc_read(codec, WM8904_FLL_CONTROL_1);
snd_soc_update_bits(codec, WM8904_CLOCK_RATES_2, snd_soc_update_bits(codec, WM8904_CLOCK_RATES_2,
WM8904_CLK_SYS_ENA, 0); WM8904_CLK_SYS_ENA, 0);