patch-2.1.60 linux/drivers/net/ltpc.c

• Lines: 32
• Date: Wed Oct 22 08:27:32 1997
• Orig file: v2.1.59/linux/drivers/net/ltpc.c
• Orig date: Tue May 13 22:41:09 1997

diff -u --recursive --new-file v2.1.59/linux/drivers/net/ltpc.c linux/drivers/net/ltpc.c
@@ -755,7 +755,7 @@
  
 static void ltpc_interrupt(int irq, void *dev_id, struct pt_regs *reg_ptr)
 {
-	struct device *dev = (struct device *) irq2dev_map[irq];
+	struct device *dev = dev_id;
 
 	if (dev==NULL) {
 		printk("ltpc_interrupt: unknown device.\n");
@@ -984,9 +984,9 @@
 	save_flags(flags);
 	cli();
 
-	probe3 = request_irq( 3, &lt_probe_handler, 0, "ltpc_probe",NULL);
-	probe4 = request_irq( 4, &lt_probe_handler, 0, "ltpc_probe",NULL);
-	probe9 = request_irq( 9, &lt_probe_handler, 0, "ltpc_probe",NULL);
+	probe3 = request_irq( 3, &lt_probe_handler, 0, "ltpc_probe",dev);
+	probe4 = request_irq( 4, &lt_probe_handler, 0, "ltpc_probe",dev);
+	probe9 = request_irq( 9, &lt_probe_handler, 0, "ltpc_probe",dev);
 
 	irqhitmask = 0;
 
@@ -1193,8 +1193,7 @@
 	ltpc_timer.data = (unsigned long) dev;
 
 	if (irq) {
-		irq2dev_map[irq] = dev;
-		(void) request_irq( irq, &ltpc_interrupt, 0, "ltpc",NULL);
+		(void) request_irq( irq, &ltpc_interrupt, 0, "ltpc", dev);
 		(void) inb_p(base+7);  /* enable interrupts from board */
 		(void) inb_p(base+7);  /* and reset irq line */
 		ltpc_timer.expires = 100;