Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / drivers / parport / parport_mfc3.c

diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c
index e5b0a544de40f4565ff9558eeb961ef4097351a0..362db31d8ca6f092853961cb383c0db69cda5230 100644 (file)
--- a/drivers/parport/parport_mfc3.c
+++ b/drivers/parport/parport_mfc3.c
@@ -219,7 +219,7 @@ static irqreturn_t mfc3_interrupt(int irq, void *dev_id)
                if (this_port[i] != NULL)
                        if (pia(this_port[i])->crb & 128) { /* Board caused interrupt */
                                dummy = pia(this_port[i])->pprb; /* clear irq bit */
-                               parport_generic_irq(irq, this_port[i]);
+                               parport_generic_irq(this_port[i]);
                        }
        return IRQ_HANDLED;
 }
@@ -356,6 +356,7 @@ static int __init parport_mfc3_init(void)
                                if (request_irq(IRQ_AMIGA_PORTS, mfc3_interrupt, IRQF_SHARED, p->name, &pp_mfc3_ops))
                                        goto out_irq;
                }
+               p->dev = &z->dev;
 
                this_port[pias++] = p;
                printk(KERN_INFO "%s: Multiface III port using irq\n", p->name);
@@ -385,7 +386,7 @@ static void __exit parport_mfc3_exit(void)
                if (!this_port[i])
                        continue;
                parport_remove_port(this_port[i]);
-               if (!this_port[i]->irq != PARPORT_IRQ_NONE) {
+               if (this_port[i]->irq != PARPORT_IRQ_NONE) {
                        if (--use_cnt == 0) 
                                free_irq(IRQ_AMIGA_PORTS, &pp_mfc3_ops);
                }