patch-1.3.70 linux/drivers/char/lp.c

• Lines: 45
• Date: Fri Mar 1 07:50:40 1996
• Orig file: v1.3.69/linux/drivers/char/lp.c
• Orig date: Mon Dec 11 15:42:02 1995

diff -u --recursive --new-file v1.3.69/linux/drivers/char/lp.c linux/drivers/char/lp.c
@@ -147,7 +147,7 @@
 	return 0;
 }
 
-static void lp_interrupt(int irq, struct pt_regs *regs)
+static void lp_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	struct lp_struct *lp = &lp_table[0];
 
@@ -358,7 +358,7 @@
 			return -ENOMEM;
 		}
 
-		ret = request_irq(irq, lp_interrupt, SA_INTERRUPT, "printer");
+		ret = request_irq(irq, lp_interrupt, SA_INTERRUPT, "printer", NULL);
 		if (ret) {
 			kfree_s(lp_table[minor].lp_buffer, LP_BUFFER_SIZE);
 			lp_table[minor].lp_buffer = NULL;
@@ -378,7 +378,7 @@
 	unsigned int irq;
 
 	if ((irq = LP_IRQ(minor))) {
-		free_irq(irq);
+		free_irq(irq, NULL);
 		kfree_s(lp_table[minor].lp_buffer, LP_BUFFER_SIZE);
 		lp_table[minor].lp_buffer = NULL;
 	}
@@ -447,14 +447,14 @@
 			}
 
 			if (oldirq) {
-				free_irq(oldirq);
+				free_irq(oldirq, NULL);
 			}
 			if (newirq) {
 				/* Install new irq */
-				if ((retval = request_irq(newirq, lp_interrupt, SA_INTERRUPT, "printer"))) {
+				if ((retval = request_irq(newirq, lp_interrupt, SA_INTERRUPT, "printer", NULL))) {
 					if (oldirq) {
 						/* restore old irq */
-						request_irq(oldirq, lp_interrupt, SA_INTERRUPT, "printer");
+						request_irq(oldirq, lp_interrupt, SA_INTERRUPT, "printer", NULL);
 					} else {
 						/* We don't need the buffer */
 						kfree_s(lp->lp_buffer, LP_BUFFER_SIZE);