patch-1.3.70 linux/drivers/cdrom/mcd.c

Next file: linux/drivers/cdrom/mcdx.c
Previous file: linux/drivers/cdrom/cm206.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.69/linux/drivers/cdrom/mcd.c linux/drivers/cdrom/mcd.c
@@ -628,7 +628,7 @@
  */
 
 static void
-mcd_interrupt(int irq, struct pt_regs * regs)
+mcd_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 {
 	int st;
 
@@ -1234,7 +1234,7 @@
 
 	/* don't get the IRQ until we know for sure the drive is there */
 
-	if (request_irq(mcd_irq, mcd_interrupt, SA_INTERRUPT, "Mitsumi CD"))
+	if (request_irq(mcd_irq, mcd_interrupt, SA_INTERRUPT, "Mitsumi CD", NULL))
 	{
 		printk("Unable to get IRQ%d for Mitsumi CD-ROM\n", mcd_irq);
                 return -EIO;
@@ -1617,7 +1617,7 @@
        return;    
      }
   release_region(mcd_port,4);
-  free_irq(mcd_irq);
+  free_irq(mcd_irq, NULL);
   printk("mcd module released.\n");
 }
 #endif MODULE

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this