From: Takashi Iwai Date: Wed, 8 Jun 2005 12:49:31 +0000 (+0200) Subject: [ALSA] Disable MPU401 on SIS7018 X-Git-Tag: MMI-PSA29.97-13-9~56759^2~175 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1ccc67d692c52dcc02e70206338ff36ac145a939;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [ALSA] Disable MPU401 on SIS7018 Trident driver Disable MPU401 support on SIS7018 since it results in kernel freeze. Signed-off-by: Takashi Iwai --- 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, 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);