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

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

diff -u --recursive --new-file v2.1.59/linux/drivers/net/ni52.c linux/drivers/net/ni52.c
@@ -241,7 +241,6 @@
 static int ni52_close(struct device *dev)
 {
 	free_irq(dev->irq, NULL);
-	irq2dev_map[dev->irq] = NULL;
 
 	ni_reset586(); /* the hard way to stop the receiver */
 
@@ -264,12 +263,11 @@
 	startrecv586(dev);
 	ni_enaint();
 
-	if(request_irq(dev->irq, &ni52_interrupt,0,"ni5210",NULL))
+	if(request_irq(dev->irq, &ni52_interrupt,0,"ni5210",dev))
 	{
 		ni_reset586();
 		return -EAGAIN;
 	}
-	irq2dev_map[dev->irq] = dev;
 
 	dev->interrupt = 0;
 	dev->tbusy = 0;
@@ -819,7 +817,7 @@
 
 static void ni52_interrupt(int irq,void *dev_id,struct pt_regs *reg_ptr)
 {
-	struct device *dev = (struct device *) irq2dev_map[irq];
+	struct device *dev = dev_id;
 	unsigned short stat;
 	int cnt=0;
 	struct priv *p;