summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorVille Syrjala <syrjala@sci.fi>2007-11-26 08:58:24 +0100
committerJaroslav Kysela <perex@perex.cz>2008-01-31 17:29:29 +0100
commit389619f1063ed21cf237e2a8081be42e66d3c9a6 (patch)
treedbf396599ed00fafa635484d1693942c27a50e98 /sound/soc
parentd47ac4338301c373eca9d817ec9c6e33b069ac51 (diff)
downloadlinux-3.10-389619f1063ed21cf237e2a8081be42e66d3c9a6.tar.gz
linux-3.10-389619f1063ed21cf237e2a8081be42e66d3c9a6.tar.bz2
linux-3.10-389619f1063ed21cf237e2a8081be42e66d3c9a6.zip
[ALSA] soc/wm8731: Fix stereo mixer controls
Disable the simultaneous load feature for the line in and headphone out volume registers. This allows left and right volume levels to be controlled separately. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8731.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 7ca0b526828..57fb95a714b 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -562,13 +562,13 @@ static int wm8731_init(struct snd_soc_device *socdev)
/* set the update bits */
reg = wm8731_read_reg_cache(codec, WM8731_LOUT1V);
- wm8731_write(codec, WM8731_LOUT1V, reg | 0x0100);
+ wm8731_write(codec, WM8731_LOUT1V, reg & ~0x0100);
reg = wm8731_read_reg_cache(codec, WM8731_ROUT1V);
- wm8731_write(codec, WM8731_ROUT1V, reg | 0x0100);
+ wm8731_write(codec, WM8731_ROUT1V, reg & ~0x0100);
reg = wm8731_read_reg_cache(codec, WM8731_LINVOL);
- wm8731_write(codec, WM8731_LINVOL, reg | 0x0100);
+ wm8731_write(codec, WM8731_LINVOL, reg & ~0x0100);
reg = wm8731_read_reg_cache(codec, WM8731_RINVOL);
- wm8731_write(codec, WM8731_RINVOL, reg | 0x0100);
+ wm8731_write(codec, WM8731_RINVOL, reg & ~0x0100);
wm8731_add_controls(codec);
wm8731_add_widgets(codec);