aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorVille Syrjala <syrjala@sci.fi>2007-11-26 02:58:24 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:29:29 -0500
commit389619f1063ed21cf237e2a8081be42e66d3c9a6 (patch)
treedbf396599ed00fafa635484d1693942c27a50e98 /sound/soc
parentd47ac4338301c373eca9d817ec9c6e33b069ac51 (diff)
[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 7ca0b5268289..57fb95a714bf 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)
562 562
563 /* set the update bits */ 563 /* set the update bits */
564 reg = wm8731_read_reg_cache(codec, WM8731_LOUT1V); 564 reg = wm8731_read_reg_cache(codec, WM8731_LOUT1V);
565 wm8731_write(codec, WM8731_LOUT1V, reg | 0x0100); 565 wm8731_write(codec, WM8731_LOUT1V, reg & ~0x0100);
566 reg = wm8731_read_reg_cache(codec, WM8731_ROUT1V); 566 reg = wm8731_read_reg_cache(codec, WM8731_ROUT1V);
567 wm8731_write(codec, WM8731_ROUT1V, reg | 0x0100); 567 wm8731_write(codec, WM8731_ROUT1V, reg & ~0x0100);
568 reg = wm8731_read_reg_cache(codec, WM8731_LINVOL); 568 reg = wm8731_read_reg_cache(codec, WM8731_LINVOL);
569 wm8731_write(codec, WM8731_LINVOL, reg | 0x0100); 569 wm8731_write(codec, WM8731_LINVOL, reg & ~0x0100);
570 reg = wm8731_read_reg_cache(codec, WM8731_RINVOL); 570 reg = wm8731_read_reg_cache(codec, WM8731_RINVOL);
571 wm8731_write(codec, WM8731_RINVOL, reg | 0x0100); 571 wm8731_write(codec, WM8731_RINVOL, reg & ~0x0100);
572 572
573 wm8731_add_controls(codec); 573 wm8731_add_controls(codec);
574 wm8731_add_widgets(codec); 574 wm8731_add_widgets(codec);