]> err.no Git - linux-2.6/commitdiff
[ALSA] Implement surround71 outputs on SB Live 24bit.
authorJames Courtier-Dutton <James@superbug.co.uk>
Sat, 21 May 2005 14:23:37 +0000 (16:23 +0200)
committerJaroslav Kysela <perex@suse.cz>
Sun, 29 May 2005 08:11:29 +0000 (10:11 +0200)
CA0106 driver
Notes: Requires updated alsa-lib.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
sound/pci/ca0106/ca0106_mixer.c

index 231ecac80861a227f30690159c41cf6c58079315..48e24860824449078d2d4bbd551b7c9cf7882de4 100644 (file)
@@ -113,7 +113,7 @@ static int snd_ca0106_shared_spdif_put(snd_kcontrol_t * kcontrol,
                } else {
                        /* Analog */
                        snd_ca0106_ptr_write(emu, SPDIF_SELECT1, 0, 0xf);
-                       snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000b0000);
+                       snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000f0000);
                        snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0,
                                snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) | 0x1000);
                        mask = inl(emu->port + GPIO) | 0x101;
@@ -437,7 +437,7 @@ static snd_kcontrol_new_t snd_ca0106_volume_control_analog_center_lfe =
 static snd_kcontrol_new_t snd_ca0106_volume_control_analog_unknown =
 {
         .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name =         "Analog Unknown Volume",
+        .name =         "Analog Side Volume",
         .info =         snd_ca0106_volume_info,
         .get =          snd_ca0106_volume_get_analog_unknown,
         .put =          snd_ca0106_volume_put_analog_unknown