Changeset 77 for GPL/trunk/alsa-kernel/pci/cmipci.c

Timestamp:

Jul 23, 2006, 11:54:27 AM (19 years ago)

Author:

vladest

Message:

Provide sources to latest exist binary. See changelog for changes

File:

• GPL/trunk/alsa-kernel/pci/cmipci.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/pci/cmipci.c

@@ -2151 +2151 @@
     CMIPCI_SB_VOL_MONO("Phone Playback Volume", CM_REG_EXTENT_IND, 5, 7),
     CMIPCI_DOUBLE("Phone Playback Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 4, 4, 1, 0, 0),
-    CMIPCI_DOUBLE("PC Speaker Playnack Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 3, 3, 1, 0, 0),
+    CMIPCI_DOUBLE("PC Speaker Playback Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 3, 3, 1, 0, 0),
     CMIPCI_DOUBLE("Mic Boost Capture Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 0, 0, 1, 0, 0),
 };
@@ -2941 +2941 @@
     if (iomidi > 0) {
         if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_CMIPCI,
-                                       iomidi, integrated_midi,
+                                       iomidi,
+                                       (integrated_midi ?
+                                        MPU401_INFO_INTEGRATED : 0),
                                        cm->irq, 0, &cm->rmidi)) < 0) {
             printk(KERN_ERR "cmipci: no UART401 device at 0x%lx\n", iomidi);