Changeset 348 for GPL/branches/alsa-resync1/alsa-kernel/pci/intel8x0.c

Timestamp:

Apr 21, 2008, 2:52:19 AM (17 years ago)

Author:

Brendan Oakley

Message:

alsa-resync1 branch merged to ALSA 1.0.4

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/intel8x0.c (modified) (5 diffs)

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

@@ -108 +108 @@
 MODULE_PARM(ac97_quirk, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
-MODULE_PARM_SYNTAX(ac97_quirk, SNDRV_ENABLED ",allows:{{-1,3}},dialog:list,default:-1");
+MODULE_PARM_SYNTAX(ac97_quirk, SNDRV_ENABLED ",allows:{{-1,4}},dialog:list,default:-1");
 #ifdef SUPPORT_JOYSTICK
 MODULE_PARM(joystick, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
@@ -862 +862 @@
 
     if ((status & chip->int_sta_mask) == 0) {
-        static int err_count = 10;
         if (status) {
             /* ack */
@@ -2982 +2981 @@
         /* workaround for 440MX */
         if (chip->fix_nocache)
-                fill_nocache(chip->bdbars, chip->bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2, 1);
+                fill_nocache(chip->bdbars.area, chip->bdbars.bytes, 1);
     int_sta_masks = 0;
     for (i = 0; i < chip->bdbars_count; i++) {
@@ -3237 +3236 @@
     pci_read_config_word(pci, 0xe6, &val);
 #ifdef SUPPORT_JOYSTICK
+        val &= ~0x100;
     if (joystick[dev]) {
         if (! request_region(ich_gameport.io, 8, "ICH gameport")) {
@@ -3249 +3249 @@
 #endif
 #ifdef SUPPORT_MIDI
+        val &= ~0x20;
     if (mpu_port[dev] > 0) {
         if (mpu_port[dev] == 0x300 || mpu_port[dev] == 0x330) {