Pull xpc-disengage into release branch

[powerpc.git] / sound / pci / trident / trident.c

diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index 5d21cb8..a8ca8e1 100644 (file)
--- 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);
@@ -176,6 +177,7 @@ static void __devexit snd_trident_remove(struct pci_dev *pci)
 
 static struct pci_driver driver = {
        .name = "Trident4DWaveAudio",
+       .owner = THIS_MODULE,
        .id_table = snd_trident_ids,
        .probe = snd_trident_probe,
        .remove = __devexit_p(snd_trident_remove),