aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen_mixer.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-01-18 09:18:32 +0100
committerJaroslav Kysela <perex@perex.cz>2008-01-31 17:30:04 +0100
commite0059549345903195d6eb796c22048204c40a785 (patch)
tree42ad0eda51c80842101c2223fb307f6ffe0e5c2e /sound/pci/oxygen/oxygen_mixer.c
parentc2353a0826d2b8fe9f5c6a6aca99149e4ee7b196 (diff)
downloadmrst-s0i3-test-e0059549345903195d6eb796c22048204c40a785.tar.gz
mrst-s0i3-test-e0059549345903195d6eb796c22048204c40a785.tar.xz
mrst-s0i3-test-e0059549345903195d6eb796c22048204c40a785.zip
[ALSA] oxygen: fix playback routing
The default playback routing must be 0xe4, not 0xe1; the front and surround DACs were exchanged. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen_mixer.c')
-rw-r--r--sound/pci/oxygen/oxygen_mixer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index fae7c0f060a..6fd2a594e89 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -121,7 +121,7 @@ static int upmix_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
void oxygen_update_dac_routing(struct oxygen *chip)
{
static const unsigned int reg_values[3] = {
- 0xe100, /* front <- 0, surround <- 1, center <- 2, back <- 3 */
+ 0xe400, /* front <- 0, surround <- 1, center <- 2, back <- 3 */
0xe000, /* front <- 0, surround <- 0, center <- 2, back <- 3 */
0x2000 /* front <- 0, surround <- 0, center <- 2, back <- 0 */
};
@@ -135,7 +135,7 @@ void oxygen_update_dac_routing(struct oxygen *chip)
else if (channels == OXYGEN_PLAY_CHANNELS_8)
reg_value = 0x6c00; /* surround <- 3, back <- 1 */
else
- reg_value = 0xe100;
+ reg_value = 0xe400;
oxygen_write16_masked(chip, OXYGEN_PLAY_ROUTING, reg_value, 0xff00);
}