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

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

diff -u --recursive --new-file v2.1.59/linux/drivers/net/hp.c linux/drivers/net/hp.c
@@ -157,7 +157,7 @@
 				outb_p(irqmap[irq] | HP_RUN, ioaddr + HP_CONFIGURE);
 				outb_p( 0x00 | HP_RUN, ioaddr + HP_CONFIGURE);
 				if (irq == autoirq_report(0)		 /* It's a good IRQ line! */
-					&& request_irq (irq, &ei_interrupt, 0, "hp", NULL) == 0) {
+					&& request_irq (irq, &ei_interrupt, 0, "hp", dev) == 0) {
 					printk(" selecting IRQ %d.\n", irq);
 					dev->irq = *irqp;
 					break;
@@ -171,7 +171,7 @@
 	} else {
 		if (dev->irq == 2)
 			dev->irq = 9;
-		if (request_irq(dev->irq, ei_interrupt, 0, "hp", NULL)) {
+		if (request_irq(dev->irq, ei_interrupt, 0, "hp", dev)) {
 			printk (" unable to get IRQ %d.\n", dev->irq);
 			return EBUSY;
 		}
@@ -436,7 +436,6 @@
 			kfree(dev->priv);
 			dev->priv = NULL;
 			free_irq(dev->irq, NULL);
-			irq2dev_map[dev->irq] = NULL;
 			release_region(ioaddr, HP_IO_EXTENT);
 			unregister_netdev(dev);
 		}