aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen_lib.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-01-28 02:33:44 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:30:17 -0500
commit911b499af45e879ccf4b8db234278a7136d056c9 (patch)
tree8708445a77b89d5bd170044b7faf4c1514c8561f /sound/pci/oxygen/oxygen_lib.c
parent236c4920ea825acbffa7bbba24c182ec6a9a8245 (diff)
[ALSA] oxygen: make line-in exclusive only on Xonar
Move the line input switching code to the Virtuoso driver because only the Xonar cards bypass the analog mixer for line input. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
-rw-r--r--sound/pci/oxygen/oxygen_lib.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 06394e4409b3..d98867c1f2d4 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -337,8 +337,6 @@ static void __devinit oxygen_init(struct oxygen *chip)
337 oxygen_write_ac97(chip, 0, AC97_REC_GAIN, 0x8000); 337 oxygen_write_ac97(chip, 0, AC97_REC_GAIN, 0x8000);
338 oxygen_write_ac97(chip, 0, AC97_CENTER_LFE_MASTER, 0x8080); 338 oxygen_write_ac97(chip, 0, AC97_CENTER_LFE_MASTER, 0x8080);
339 oxygen_write_ac97(chip, 0, AC97_SURROUND_MASTER, 0x8080); 339 oxygen_write_ac97(chip, 0, AC97_SURROUND_MASTER, 0x8080);
340 oxygen_ac97_clear_bits(chip, 0,
341 CM9780_GPIO_STATUS, CM9780_GPO0);
342 /* power down unused ADCs and DACs */ 340 /* power down unused ADCs and DACs */
343 oxygen_ac97_set_bits(chip, 0, AC97_POWERDOWN, 341 oxygen_ac97_set_bits(chip, 0, AC97_POWERDOWN,
344 AC97_PD_PR0 | AC97_PD_PR1); 342 AC97_PD_PR0 | AC97_PD_PR1);