summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8731.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-01 14:34:27 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-01 14:34:27 +0300
commit97884b7a7867fa9926a0711035cefaa4d0aafda4 (patch)
tree00a4fb7097fe19e976c107d65ec65824706adc4a /sound/soc/codecs/wm8731.c
parent06c6f4d34a23f7c9c783f1a875bb492b15fa23ac (diff)
parent2062ea522bb58bb2aeee86d051b37136491ccd65 (diff)
downloadlinux-97884b7a7867fa9926a0711035cefaa4d0aafda4.tar.xz
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8731.c')
-rw-r--r--sound/soc/codecs/wm8731.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index a1041450d9bb..94e0cf3a66a1 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -526,7 +526,7 @@ static int wm8731_probe(struct snd_soc_codec *codec)
snd_soc_update_bits(codec, WM8731_RINVOL, 0x100, 0);
/* Disable bypass path by default */
- snd_soc_update_bits(codec, WM8731_APANA, 0x4, 0);
+ snd_soc_update_bits(codec, WM8731_APANA, 0x8, 0);
snd_soc_add_controls(codec, wm8731_snd_controls,
ARRAY_SIZE(wm8731_snd_controls));