diff options
Diffstat (limited to 'sound/isa/opl3sa2.c')
-rw-r--r-- | sound/isa/opl3sa2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 9b915e27b5bd..bbafb0b543ea 100644 --- 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) | |||
667 | err = snd_opl3sa2_detect(card); | 667 | err = snd_opl3sa2_detect(card); |
668 | if (err < 0) | 668 | if (err < 0) |
669 | return err; | 669 | return err; |
670 | err = request_irq(xirq, snd_opl3sa2_interrupt, IRQF_DISABLED, | 670 | err = request_irq(xirq, snd_opl3sa2_interrupt, 0, |
671 | "OPL3-SA2", card); | 671 | "OPL3-SA2", card); |
672 | if (err) { | 672 | if (err) { |
673 | snd_printk(KERN_ERR PFX "can't grab IRQ %d\n", xirq); | 673 | 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) | |||
707 | } | 707 | } |
708 | if (midi_port[dev] >= 0x300 && midi_port[dev] < 0x340) { | 708 | if (midi_port[dev] >= 0x300 && midi_port[dev] < 0x340) { |
709 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_OPL3SA2, | 709 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_OPL3SA2, |
710 | midi_port[dev], 0, | 710 | midi_port[dev], |
711 | xirq, 0, &chip->rmidi)) < 0) | 711 | MPU401_INFO_IRQ_HOOK, -1, |
712 | &chip->rmidi)) < 0) | ||
712 | return err; | 713 | return err; |
713 | } | 714 | } |
714 | sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d", | 715 | sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d", |