Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / sound / isa / opti9xx / miro.c

diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index 83d64bc07ff0f113fcf871d0d7e45f7b1ffffb48..1dd98375ac85788f294ec5a7327fcd74ba2720c6 100644 (file)
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -967,7 +967,7 @@ static void __init snd_miro_proc_init(struct snd_miro * miro)
        struct snd_info_entry *entry;
 
        if (! snd_card_proc_new(miro->card, "miro", &entry))
-               snd_info_set_text_ops(entry, miro, 1024, snd_miro_proc_read);
+               snd_info_set_text_ops(entry, miro, snd_miro_proc_read);
 }
 
 /*
@@ -1179,20 +1179,17 @@ static int __init snd_card_miro_aci_detect(struct snd_card *card, struct snd_mir
         /* force ACI into a known state */
        for (i = 0; i < 3; i++)
                if (aci_cmd(miro, ACI_ERROR_OP, -1, -1) < 0) {
-                       snd_card_free(card);
                        snd_printk(KERN_ERR "can't force aci into known state.\n");
                        return -ENXIO;
                }
 
        if ((miro->aci_vendor=aci_cmd(miro, ACI_READ_IDCODE, -1, -1)) < 0 ||
            (miro->aci_product=aci_cmd(miro, ACI_READ_IDCODE, -1, -1)) < 0) {
-               snd_card_free(card);
                snd_printk(KERN_ERR "can't read aci id on 0x%lx.\n", miro->aci_port);
                return -ENXIO;
        }
 
        if ((miro->aci_version=aci_cmd(miro, ACI_READ_VERSION, -1, -1)) < 0) {
-               snd_card_free(card);
                snd_printk(KERN_ERR "can't read aci version on 0x%lx.\n", 
                           miro->aci_port);
                return -ENXIO;
@@ -1385,7 +1382,7 @@ static int __init snd_miro_probe(struct platform_device *devptr)
                rmidi = NULL;
        else
                if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                               miro->mpu_port, 0, miro->mpu_irq, SA_INTERRUPT,
+                               miro->mpu_port, 0, miro->mpu_irq, IRQF_DISABLED,
                                &rmidi)))
                        snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", miro->mpu_port);