diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-01 06:34:27 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-01 06:34:27 -0500 |
| commit | 97884b7a7867fa9926a0711035cefaa4d0aafda4 (patch) | |
| tree | 00a4fb7097fe19e976c107d65ec65824706adc4a /sound/soc/codecs/wm8731.c | |
| parent | 06c6f4d34a23f7c9c783f1a875bb492b15fa23ac (diff) | |
| parent | 2062ea522bb58bb2aeee86d051b37136491ccd65 (diff) | |
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.c | 2 |
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) | |||
| 526 | snd_soc_update_bits(codec, WM8731_RINVOL, 0x100, 0); | 526 | snd_soc_update_bits(codec, WM8731_RINVOL, 0x100, 0); |
| 527 | 527 | ||
| 528 | /* Disable bypass path by default */ | 528 | /* Disable bypass path by default */ |
| 529 | snd_soc_update_bits(codec, WM8731_APANA, 0x4, 0); | 529 | snd_soc_update_bits(codec, WM8731_APANA, 0x8, 0); |
| 530 | 530 | ||
| 531 | snd_soc_add_controls(codec, wm8731_snd_controls, | 531 | snd_soc_add_controls(codec, wm8731_snd_controls, |
| 532 | ARRAY_SIZE(wm8731_snd_controls)); | 532 | ARRAY_SIZE(wm8731_snd_controls)); |