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

• Lines: 32
• Date: Wed Oct 22 08:27:31 1997
• Orig file: v2.1.59/linux/drivers/net/8390.c
• Orig date: Mon Aug 11 14:47:04 1997

diff -u --recursive --new-file v2.1.59/linux/drivers/net/8390.c linux/drivers/net/8390.c
@@ -121,7 +121,6 @@
 	return -ENXIO;
     }
     
-    irq2dev_map[dev->irq] = dev;
     NS8390_init(dev, 1);
     dev->start = 1;
     ei_local->irqlock = 0;
@@ -284,7 +283,7 @@
    Handle the ether interface interrupts. */
 void ei_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 {
-    struct device *dev = (struct device *)(irq2dev_map[irq]);
+	struct device *dev = dev_id;
     int e8390_base;
     int interrupts, nr_serviced = 0;
     struct ei_device *ei_local;
@@ -296,12 +295,14 @@
     e8390_base = dev->base_addr;
     ei_local = (struct ei_device *) dev->priv;
     if (dev->interrupt || ei_local->irqlock) {
+#if 1 /* This might just be an interrupt for a PCI device sharing this line */
 		/* The "irqlock" check is only for testing. */
 		printk(ei_local->irqlock
 			   ? "%s: Interrupted while interrupts are masked! isr=%#2x imr=%#2x.\n"
 			   : "%s: Reentering the interrupt handler! isr=%#2x imr=%#2x.\n",
 			   dev->name, inb_p(e8390_base + EN0_ISR),
 			   inb_p(e8390_base + EN0_IMR));
+#endif
 		return;
     }