提交 97884b7a 编写于 作者: M Mark Brown

Merge branch 'for-2.6.37' into for-2.6.38

...@@ -526,7 +526,7 @@ static int wm8731_probe(struct snd_soc_codec *codec) ...@@ -526,7 +526,7 @@ static int wm8731_probe(struct snd_soc_codec *codec)
snd_soc_update_bits(codec, WM8731_RINVOL, 0x100, 0); snd_soc_update_bits(codec, WM8731_RINVOL, 0x100, 0);
/* Disable bypass path by default */ /* 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, snd_soc_add_controls(codec, wm8731_snd_controls,
ARRAY_SIZE(wm8731_snd_controls)); ARRAY_SIZE(wm8731_snd_controls));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册