---

yaml --- r: 257487 b: refs/heads/master c: 84abd1b h: refs/heads/master i: 257485: c4ee93a 257483: 9fe5d86 257479: bae11ca 257471: 567dfc5 v: v3
git-mirror · Jun 6, 2011 · 3c5e15f · 3c5e15f
1 parent a988ff1
commit 3c5e15f
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: aa72f6899b9fb3dc824c458234ae3507a60e462d
+refs/heads/master: 84abd1b395cf41269ffb5605a6ece3d6d7f8a3e1
diff --git a/trunk/sound/soc/codecs/wm8915.c b/trunk/sound/soc/codecs/wm8915.c
@@ -1835,7 +1835,7 @@ static int wm8915_set_sysclk(struct snd_soc_dai *dai,
 	int old;
 
 	/* Disable SYSCLK while we reconfigure */
-	old = snd_soc_read(codec, WM8915_AIF_CLOCKING_1);
+	old = snd_soc_read(codec, WM8915_AIF_CLOCKING_1) & WM8915_SYSCLK_ENA;
 	snd_soc_update_bits(codec, WM8915_AIF_CLOCKING_1,
 			    WM8915_SYSCLK_ENA, 0);
 
@@ -2034,6 +2034,7 @@ static int wm8915_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
 		break;
 	case WM8915_FLL_MCLK2:
 		reg = 1;
+		break;
 	case WM8915_FLL_DACLRCLK1:
 		reg = 2;
 		break;