diff options
author | Roman Volkov <v1ron@mail.ru> | 2014-01-24 16:18:20 +0400 |
---|---|---|
committer | Clemens Ladisch <clemens@ladisch.de> | 2014-01-29 23:45:53 +0400 |
commit | 3f49a66f6ceff1c87b49858644771c17763902ab (patch) | |
tree | 7f483ae4302e890874e6c9aa32580de330f9828d /sound/pci/oxygen/xonar_dg_mixer.c | |
parent | fc114e9fbaf555e2d7fbfe144dac716142e22331 (diff) | |
download | linux-3f49a66f6ceff1c87b49858644771c17763902ab.tar.xz |
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.c | 5 |
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) unsigned int i; int err; + output_select_apply(chip); + input_source_apply(chip); + oxygen_update_dac_routing(chip); + for (i = 0; i < ARRAY_SIZE(dg_controls); ++i) { err = snd_ctl_add(chip->card, snd_ctl_new1(&dg_controls[i], chip)); if (err < 0) return err; } + return 0; } |