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

• Lines: 30
• Date: Wed Oct 22 08:27:32 1997
• Orig file: v2.1.59/linux/drivers/net/e2100.c
• Orig date: Wed Apr 23 19:01:19 1997

diff -u --recursive --new-file v2.1.59/linux/drivers/net/e2100.c linux/drivers/net/e2100.c
@@ -254,10 +254,9 @@
 {
 	short ioaddr = dev->base_addr;
 
-	if (request_irq(dev->irq, ei_interrupt, 0, "e2100", NULL)) {
+	if (request_irq(dev->irq, ei_interrupt, 0, "e2100", dev)) {
 		return EBUSY;
 	}
-	irq2dev_map[dev->irq] = dev;
 
 	/* Set the interrupt line and memory base on the hardware. */
 	inb(ioaddr + E21_IRQ_LOW);
@@ -362,8 +361,6 @@
 	inb(ioaddr + E21_IRQ_HIGH); 			/* High IRQ bit, and if_port. */
 	outb(0, ioaddr + E21_ASIC);
 
-	irq2dev_map[dev->irq] = NULL;
-
 	ei_close(dev);
 
 	/* Double-check that the memory has been turned off, because really
@@ -442,7 +439,7 @@
 	for (this_dev = 0; this_dev < MAX_E21_CARDS; this_dev++) {
 		struct device *dev = &dev_e21[this_dev];
 		if (dev->priv != NULL) {
-			/* NB: e21_close() handles free_irq + irq2dev map */
+			/* NB: e21_close() handles free_irq */
 			kfree(dev->priv);
 			dev->priv = NULL;
 			release_region(dev->base_addr, E21_IO_EXTENT);