]> err.no Git - linux-2.6/commitdiff
[ALSA] Disable MPU401 on SIS7018
authorTakashi Iwai <tiwai@suse.de>
Wed, 8 Jun 2005 12:49:31 +0000 (14:49 +0200)
committerJaroslav Kysela <perex@suse.cz>
Wed, 22 Jun 2005 10:28:33 +0000 (12:28 +0200)
Trident driver
Disable MPU401 support on SIS7018 since it results in kernel freeze.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/trident/trident.c

index 5d21cb811c8a8aafe664e652ae936976ac0db558..940d531575c098cd736776420b0b674c45094e3d 100644 (file)
@@ -143,7 +143,8 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
                        return err;
                }
        }
-       if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
+       if (trident->device != TRIDENT_DEVICE_ID_SI7018 &&
+           (err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
                                       trident->midi_port, 1,
                                       trident->irq, 0, &trident->rmidi)) < 0) {
                snd_card_free(card);