diff --git a/[refs] b/[refs]
index 70eeae666a34..bd622a643b7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41e41f1f3495c6a7443977d2842d6911e3dcf31c
+refs/heads/master: 1ccc67d692c52dcc02e70206338ff36ac145a939
diff --git a/trunk/sound/pci/trident/trident.c b/trunk/sound/pci/trident/trident.c
index 5d21cb811c8a..940d531575c0 100644
--- a/trunk/sound/pci/trident/trident.c
+++ b/trunk/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);