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

• Lines: 27
• Date: Fri Mar 1 07:50:39 1996
• Orig file: v1.3.69/linux/drivers/cdrom/cm206.c
• Orig date: Thu Nov 9 11:23:47 1995

diff -u --recursive --new-file v1.3.69/linux/drivers/cdrom/cm206.c linux/drivers/cdrom/cm206.c
@@ -221,7 +221,7 @@
    as there seems so reason for this to happen.
 */
 
-static void cm206_interrupt(int sig, struct pt_regs * regs) /* you rang? */
+static void cm206_interrupt(int sig, void *dev_id, struct pt_regs * regs) /* you rang? */
 {
   volatile ush fool;
     cd->intr_ds = inw(r_data_status); /* resets data_ready, data_error,
@@ -1052,7 +1052,7 @@
       return;
     }
   case 3: 
-    free_irq(cm206_irq);
+    free_irq(cm206_irq, NULL);
   case 2: 
   case 1: 
     kfree(cd);
@@ -1156,7 +1156,7 @@
   else printk(" single");
   printk(" speed drive");
   if (e & dcf_motorized_tray) printk(", motorized tray");
-  if (request_irq(cm206_irq, cm206_interrupt, 0, "cm206")) {
+  if (request_irq(cm206_irq, cm206_interrupt, 0, "cm206", NULL)) {
     printk("\nUnable to reserve IRQ---aborted\n");
     cleanup(2);
     return -EIO;