Merge branch 'sh-latest' of git://github.com/pmundt/linux-sh

[pandora-kernel.git] / sound / isa / es18xx.c

diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index fb4d6b3..bf6ad0b 100644 (file)
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -1805,7 +1805,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card,
                return -EBUSY;
        }
 
-       if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx",
+       if (request_irq(irq, snd_es18xx_interrupt, 0, "ES18xx",
                        (void *) card)) {
                snd_es18xx_free(card);
                snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);
@@ -2160,8 +2160,8 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)
 
        if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
                err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,
-                                         mpu_port[dev], 0,
-                                         irq[dev], 0, &chip->rmidi);
+                                         mpu_port[dev], MPU401_INFO_IRQ_HOOK,
+                                         -1, &chip->rmidi);
                if (err < 0)
                        return err;
        }