aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/xonar_dg_mixer.c
diff options
context:
space:
mode:
authorRoman Volkov <v1ron@mail.ru>2014-01-24 07:18:20 -0500
committerClemens Ladisch <clemens@ladisch.de>2014-01-29 14:45:53 -0500
commit3f49a66f6ceff1c87b49858644771c17763902ab (patch)
tree7f483ae4302e890874e6c9aa32580de330f9828d /sound/pci/oxygen/xonar_dg_mixer.c
parentfc114e9fbaf555e2d7fbfe144dac716142e22331 (diff)
ALSA: oxygen: Xonar DG(X): cleanup and minor changes
Remove old SPI control functions, change anti-pop init sequence, remove some garbage from structures. The 'Apply' functions must be called at the mixer initialization, otherwise mixer settings sometimes will not be applied at startup. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/pci/oxygen/xonar_dg_mixer.c')
-rw-r--r--sound/pci/oxygen/xonar_dg_mixer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/oxygen/xonar_dg_mixer.c b/sound/pci/oxygen/xonar_dg_mixer.c
index dfdfc991f8e6..b885dac28a09 100644
--- a/sound/pci/oxygen/xonar_dg_mixer.c
+++ b/sound/pci/oxygen/xonar_dg_mixer.c
@@ -435,12 +435,17 @@ static int dg_mixer_init(struct oxygen *chip)
435 unsigned int i; 435 unsigned int i;
436 int err; 436 int err;
437 437
438 output_select_apply(chip);
439 input_source_apply(chip);
440 oxygen_update_dac_routing(chip);
441
438 for (i = 0; i < ARRAY_SIZE(dg_controls); ++i) { 442 for (i = 0; i < ARRAY_SIZE(dg_controls); ++i) {
439 err = snd_ctl_add(chip->card, 443 err = snd_ctl_add(chip->card,
440 snd_ctl_new1(&dg_controls[i], chip)); 444 snd_ctl_new1(&dg_controls[i], chip));
441 if (err < 0) 445 if (err < 0)
442 return err; 446 return err;
443 } 447 }
448
444 return 0; 449 return 0;
445} 450}
446 451