patch-1.3.70 linux/drivers/scsi/aha1542.c

• Lines: 27
• Date: Fri Mar 1 07:50:51 1996
• Orig file: v1.3.69/linux/drivers/scsi/aha1542.c
• Orig date: Tue Jan 23 21:15:43 1996

diff -u --recursive --new-file v1.3.69/linux/drivers/scsi/aha1542.c linux/drivers/scsi/aha1542.c
@@ -353,7 +353,7 @@
 }
 
 /* A "high" level interrupt handler */
-static void aha1542_intr_handle(int irq, struct pt_regs *regs)
+static void aha1542_intr_handle(int irq, void *dev_id, struct pt_regs *regs)
 {
     void (*my_done)(Scsi_Cmnd *) = NULL;
     int errstatus, mbi, mbo, mbistatus;
@@ -1000,7 +1000,7 @@
 		    DEB(printk("aha1542_detect: enable interrupt channel %d\n", irq_level));
 		    save_flags(flags);
 		    cli();
-		    if (request_irq(irq_level,aha1542_intr_handle, 0, "aha1542")) {
+		    if (request_irq(irq_level,aha1542_intr_handle, 0, "aha1542", NULL)) {
 			    printk("Unable to allocate IRQ for adaptec controller.\n");
 			    goto unregister;
 		    }
@@ -1008,7 +1008,7 @@
 		    if (dma_chan != 0xFF) {
 			    if (request_dma(dma_chan,"aha1542")) {
 				    printk("Unable to allocate DMA channel for Adaptec.\n");
-				    free_irq(irq_level);
+				    free_irq(irq_level, NULL);
 				    goto unregister;
 			    }