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

Timestamp:

Aug 30, 2008, 9:18:38 PM (17 years ago)

Author:

Brendan Oakley

Message:

Missed stuff in 1.0.4

File:

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

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

@@ -42 +42 @@
 #define SNDRV_GET_ID
 #include <sound/initval.h>
+/* for 440MX workaround */
+#include <asm/pgtable.h>
+#include <asm/cacheflush.h>
 
 #define I810_DEBUG
@@ -82 +85 @@
 #else
 static int ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
+static int ac97_quirk[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = AC97_TUNE_DEFAULT};
 #endif
 #ifdef SUPPORT_JOYSTICK
@@ -865 +869 @@
             /* ack */
             iputdword(chip, chip->int_sta_reg, status);
-            /* FIXME: on some ICH5 board shows the same
-             *        problem.  So we return IRQ_HANDLED
-             *        in any cases.
-             * (or, maybe add a new module param to control this?)
-             */
-#if 0
-            if (chip->device_type != DEVICE_NFORCE)
-                status ^= igetdword(chip, chip->int_sta_reg);
-#endif
-        }
-        return IRQ_NONE/*RETVAL(status)*/;
+                        /* some Nforce[2] boards have problems when
+                           IRQ_NONE is returned here.
+                        */
+                        if (chip->device_type != DEVICE_NFORCE)
+                                status = 0;
+        }
+                spin_unlock(&chip->reg_lock);
+        return IRQ_RETVAL(status);
     }
 #ifdef TARGET_OS2