diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-04-01 04:02:18 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:30 -0400 |
commit | e97f79994ac715e4c8724b201bd3328463ec9314 (patch) | |
tree | a8cc01dc674185458964ee4636fabce8e71d3726 /sound/pci/oxygen/oxygen_lib.c | |
parent | 0c4cc4430f40089bb85557e309038faa458247f1 (diff) |
[ALSA] oxygen: fix line-in recording selection (now for real)
On C-Media cards, the GPIO pin 0 of the CM9780 must be handled exactly
like on Xonar cards, so move the Xonar code to the common mixer code.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
-rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 858e6d4c9194..4f3d9e5fc5db 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c | |||
@@ -360,6 +360,8 @@ static void oxygen_init(struct oxygen *chip) | |||
360 | oxygen_write_ac97(chip, 0, AC97_REC_GAIN, 0x8000); | 360 | oxygen_write_ac97(chip, 0, AC97_REC_GAIN, 0x8000); |
361 | oxygen_write_ac97(chip, 0, AC97_CENTER_LFE_MASTER, 0x8080); | 361 | oxygen_write_ac97(chip, 0, AC97_CENTER_LFE_MASTER, 0x8080); |
362 | oxygen_write_ac97(chip, 0, AC97_SURROUND_MASTER, 0x8080); | 362 | oxygen_write_ac97(chip, 0, AC97_SURROUND_MASTER, 0x8080); |
363 | oxygen_ac97_clear_bits(chip, 0, CM9780_GPIO_STATUS, | ||
364 | CM9780_GPO0); | ||
363 | /* power down unused ADCs and DACs */ | 365 | /* power down unused ADCs and DACs */ |
364 | oxygen_ac97_set_bits(chip, 0, AC97_POWERDOWN, | 366 | oxygen_ac97_set_bits(chip, 0, AC97_POWERDOWN, |
365 | AC97_PD_PR0 | AC97_PD_PR1); | 367 | AC97_PD_PR0 | AC97_PD_PR1); |