Changeset 290 for GPL/branches/alsa-resync1/alsa-kernel/pci/cmipci.c

Timestamp:

Feb 16, 2008, 7:40:20 AM (17 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 1.0.2

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/cmipci.c (modified) (4 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/cmipci.c

@@ -1549 +1549 @@
     runtime->hw.channels_max = cm->max_channels;
     snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);
+        cm->dig_pcm_status = cm->dig_status;
     return 0;
 }
@@ -3005 +3006 @@
         }
 #endif
+        snd_card_set_dev(card, &pci->dev);
+
     *rcmipci = cm;
     return 0;
@@ -3206 +3209 @@
 
 /* format is: snd-cmipci=enable,index,id,
-                         mpu_port,fm_port,soft_ac3,joystick */
+                         mpu_port,fm_port,soft_ac3,joystick_port */
 
 static int __init alsa_card_cmipci_setup(char *str)
@@ -3223 +3226 @@
 #endif
 #ifdef SUPPORT_JOYSTICK
-               && get_option(&str,&joystick[nr_dev]) == 2
+               && get_option(&str,&joystick_port[nr_dev]) == 2
 #endif
                );