diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-06-08 08:49:31 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-06-22 06:28:33 -0400 |
commit | 1ccc67d692c52dcc02e70206338ff36ac145a939 (patch) | |
tree | e044d93d29569141c1ac5f2d1da9b117158d4f22 /sound/pci/trident/trident.c | |
parent | 41e41f1f3495c6a7443977d2842d6911e3dcf31c (diff) |
[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/pci/trident/trident.c')
-rw-r--r-- | sound/pci/trident/trident.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c index 5d21cb811c8a..940d531575c0 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, | |||
143 | return err; | 143 | return err; |
144 | } | 144 | } |
145 | } | 145 | } |
146 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE, | 146 | if (trident->device != TRIDENT_DEVICE_ID_SI7018 && |
147 | (err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE, | ||
147 | trident->midi_port, 1, | 148 | trident->midi_port, 1, |
148 | trident->irq, 0, &trident->rmidi)) < 0) { | 149 | trident->irq, 0, &trident->rmidi)) < 0) { |
149 | snd_card_free(card); | 150 | snd_card_free(card); |