aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/xonar_dg.c
diff options
context:
space:
mode:
authorRoman Volkov <v1ron@mail.ru>2014-01-24 16:18:15 +0400
committerClemens Ladisch <clemens@ladisch.de>2014-01-29 20:45:50 +0100
commit2809cb84d1672b639a4a41a0fa077fb554699072 (patch)
tree32b117862dc307aa0f579191ced847d0c54ad528 /sound/pci/oxygen/xonar_dg.c
parentALSA: oxygen: Xonar DG(X): capture from I2S channel 1, not 2 (diff)
downloadlinux-dev-2809cb84d1672b639a4a41a0fa077fb554699072.tar.xz
linux-dev-2809cb84d1672b639a4a41a0fa077fb554699072.zip
ALSA: oxygen: Xonar DG(X): modify playback output select
Change the order of elements in the output select control. This will reduce the number of relay switches. Change 'put' function to call the oxygen_update_dac_routing() function. Otherwise multichannel playback does not work. Also there is a new function to apply settings, this prevents from duplicating the code. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/pci/oxygen/xonar_dg.c')
-rw-r--r--sound/pci/oxygen/xonar_dg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/oxygen/xonar_dg.c b/sound/pci/oxygen/xonar_dg.c
index d12d83554abb..6cec934e6628 100644
--- a/sound/pci/oxygen/xonar_dg.c
+++ b/sound/pci/oxygen/xonar_dg.c
@@ -268,7 +268,7 @@ unsigned int adjust_dg_dac_routing(struct oxygen *chip,
struct dg *data = chip->model_data;
unsigned int routing = 0;
- switch (data->pcm_output) {
+ switch (data->output_sel) {
case PLAYBACK_DST_HP:
case PLAYBACK_DST_HP_FP:
oxygen_write8_masked(chip, OXYGEN_PLAY_ROUTING,