Merge branch 'for-3.2' into for-3.3

Conflicts:
	sound/soc/codecs/wm8940.c

1 files changed, 3 insertions, 1 deletions

diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index fec3892b234c..1b5856b4ea7c 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -488,6 +488,8 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec,
                 break;
         }
 
+        codec->dapm.bias_level = level;
+
         return ret;
 }
 
@@ -619,7 +621,7 @@ static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
 
         switch (div_id) {
         case WM8940_BCLKDIV:
-                reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFEF3;
+                reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFE3;
                 ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 2));
                 break;
         case WM8940_MCLKDIV: