summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-06-08 14:49:31 +0200
committerJaroslav Kysela <perex@suse.cz>2005-06-22 12:28:33 +0200
commit1ccc67d692c52dcc02e70206338ff36ac145a939 (patch)
treee044d93d29569141c1ac5f2d1da9b117158d4f22 /sound
parent41e41f1f3495c6a7443977d2842d6911e3dcf31c (diff)
downloadop-kernel-dev-1ccc67d692c52dcc02e70206338ff36ac145a939.zip
op-kernel-dev-1ccc67d692c52dcc02e70206338ff36ac145a939.tar.gz
[ALSA] Disable MPU401 on SIS7018
Trident driver Disable MPU401 support on SIS7018 since it results in kernel freeze. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/trident/trident.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index 5d21cb8..940d531 100644
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -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);
OpenPOWER on IntegriCloud