---

yaml --- r: 182795 b: refs/heads/master c: 18240b6 h: refs/heads/master i: 182793: ed29aab 182791: 3124151 v: v3
git-mirror · Dec 18, 2009 · b89c125 · b89c125
1 parent e6af531
commit b89c125
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a17accb7ae9291ef5a0ad609f92aa43263735855
+refs/heads/master: 18240b67c8ca5efbbb2e8bb11942cc3db033fb16
diff --git a/trunk/sound/soc/codecs/wm8904.c b/trunk/sound/soc/codecs/wm8904.c
@@ -1893,6 +1893,8 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
 	    Fout == wm8904->fll_fout)
 		return 0;
 
+	clock2 = snd_soc_read(codec, WM8904_CLOCK_RATES_2);
+
 	if (Fout == 0) {
 		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
 	 * misclocking */
-	clock2 = snd_soc_read(codec, WM8904_CLOCK_RATES_2);
 	fll1 = snd_soc_read(codec, WM8904_FLL_CONTROL_1);
 	snd_soc_update_bits(codec, WM8904_CLOCK_RATES_2,
 			    WM8904_CLK_SYS_ENA, 0);