Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / sound / isa / opl3sa2.c

diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 9b915e27b5bd7d422e3b9defd39b3c921795e5cf..bbafb0b543eadebadae7b18b512d94a98aa8875a 100644 (file)
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -667,7 +667,7 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
        err = snd_opl3sa2_detect(card);
        if (err < 0)
                return err;
-       err = request_irq(xirq, snd_opl3sa2_interrupt, IRQF_DISABLED,
+       err = request_irq(xirq, snd_opl3sa2_interrupt, 0,
                          "OPL3-SA2", card);
        if (err) {
                snd_printk(KERN_ERR PFX "can't grab IRQ %d\n", xirq);
@@ -707,8 +707,9 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
        }
        if (midi_port[dev] >= 0x300 && midi_port[dev] < 0x340) {
                if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_OPL3SA2,
-                                              midi_port[dev], 0,
-                                              xirq, 0, &chip->rmidi)) < 0)
+                                              midi_port[dev],
+                                              MPU401_INFO_IRQ_HOOK, -1,
+                                              &chip->rmidi)) < 0)
                        return err;
        }
        sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",