From 3c5e15f34442400bf96f191ac075cdb52384d50c Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 6 Jun 2011 12:47:06 +0100
Subject: [PATCH] --- yaml --- r: 257487 b: refs/heads/master c:
 84abd1b395cf41269ffb5605a6ece3d6d7f8a3e1 h: refs/heads/master i:   257485:
 c4ee93a693d5f67841fdac45152bc132071bf2d9   257483:
 9fe5d86f392c1d1d9fb99568e794d91aca9ec968   257479:
 bae11ca03f4ed98ab93c3cf945a824f564e8976d   257471:
 567dfc516f443d37877720ed5a6bc322b3a13d72 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8915.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ab939e092413..996e94aa2a11 100644
--- 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
index 5a59ef73e702..b654fcd14897 100644
--- 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;