From: Ville Syrjala Date: Mon, 26 Nov 2007 07:58:24 +0000 (+0100) Subject: [ALSA] soc/wm8731: Fix stereo mixer controls X-Git-Tag: v2.6.25-rc1~1127^2~221 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=389619f1063ed21cf237e2a8081be42e66d3c9a6;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- 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);