aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ca0106/ca0106_mixer.c
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2005-05-21 10:23:37 -0400
committerJaroslav Kysela <perex@suse.cz>2005-05-29 04:11:29 -0400
commit1f82941e82422fcb15d63431e163bf4f0b9389d9 (patch)
tree47b0555ffdae809156fa8ef6013de7019f2ba929 /sound/pci/ca0106/ca0106_mixer.c
parent82f008c2b651eefbf293546440fd226580b0c111 (diff)
[ALSA] Implement surround71 outputs on SB Live 24bit.
CA0106 driver Notes: Requires updated alsa-lib. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Diffstat (limited to 'sound/pci/ca0106/ca0106_mixer.c')
-rw-r--r--sound/pci/ca0106/ca0106_mixer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 231ecac8086..48e24860824 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -113,7 +113,7 @@ static int snd_ca0106_shared_spdif_put(snd_kcontrol_t * kcontrol,
113 } else { 113 } else {
114 /* Analog */ 114 /* Analog */
115 snd_ca0106_ptr_write(emu, SPDIF_SELECT1, 0, 0xf); 115 snd_ca0106_ptr_write(emu, SPDIF_SELECT1, 0, 0xf);
116 snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000b0000); 116 snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000f0000);
117 snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0, 117 snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0,
118 snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) | 0x1000); 118 snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) | 0x1000);
119 mask = inl(emu->port + GPIO) | 0x101; 119 mask = inl(emu->port + GPIO) | 0x101;
@@ -437,7 +437,7 @@ static snd_kcontrol_new_t snd_ca0106_volume_control_analog_center_lfe =
437static snd_kcontrol_new_t snd_ca0106_volume_control_analog_unknown = 437static snd_kcontrol_new_t snd_ca0106_volume_control_analog_unknown =
438{ 438{
439 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 439 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
440 .name = "Analog Unknown Volume", 440 .name = "Analog Side Volume",
441 .info = snd_ca0106_volume_info, 441 .info = snd_ca0106_volume_info,
442 .get = snd_ca0106_volume_get_analog_unknown, 442 .get = snd_ca0106_volume_get_analog_unknown,
443 .put = snd_ca0106_volume_put_analog_unknown 443 .put = snd_ca0106_volume_put_analog_unknown