Merge branch 'for-3.0' into for-3.1

1 files changed, 2 insertions, 1 deletions

diff --git a/sound/soc/codecs/wm8915.c b/sound/soc/codecs/wm8915.c
index 5a59ef73e702..b654fcd14897 100644
--- a/sound/soc/codecs/wm8915.c
+++ b/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;