Changeset 300 for GPL/branches/alsa-resync1/alsa-kernel/isa

Timestamp:

Feb 24, 2008, 8:18:08 PM (17 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 1.0.3

Location:

GPL/branches/alsa-resync1/alsa-kernel/isa

Files:

• es1688/es1688.c (modified) (1 diff)
• gus/interwave.c (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/isa/es1688/es1688.c

@@ -148 +148 @@
         }
 
-        if (xmpu_irq >= 0) {
+        if (xmpu_irq >= 0 && xmpu_irq != SNDRV_AUTO_IRQ && chip->mpu_port > 0) {
                 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
                                                chip->mpu_port, 0,

GPL/branches/alsa-resync1/alsa-kernel/isa/gus/interwave.c

@@ -164 +164 @@
         /* Panasonic PCA761AW Audio Card */
         { .id = "ADV55ff", .devs = { { .id = "ADV0010" } } },
+        /* InterWave STB without TEA6330T */
+        { .id = "ADV550a", .devs = { { .id = "ADV0010" } } },
 #else
         /* InterWave STB with TEA6330T */