summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8940.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 05:17:30 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 05:17:30 +0400
commit4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (patch)
tree8dd15df476c14b4ab85d5beca775af561c2ea23d /sound/soc/codecs/wm8940.c
parent03431972ac16bbfcbfb831bb37c419f8f71bf16d (diff)
parent19940b3d55c87d8089a8cb0fa8e5a9918a3846bd (diff)
downloadlinux-4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb.tar.xz
Merge branch 'for-3.2' into for-3.3
Conflicts: sound/soc/codecs/wm8940.c
Diffstat (limited to 'sound/soc/codecs/wm8940.c')
-rw-r--r--sound/soc/codecs/wm8940.c4
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: