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

Next file: linux/drivers/net/com90xx.c
Previous file: linux/drivers/net/com20020.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.59/linux/drivers/net/com90io.c linux/drivers/net/com90io.c
@@ -296,12 +296,11 @@
   struct arcnet_local *lp;
 
   /* reserve the irq */
-  if (request_irq(airq,&arcnet_interrupt,0,"arcnet (COM90xx-IO)",NULL))
+  if (request_irq(airq,&arcnet_interrupt,0,"arcnet (COM90xx-IO)",dev))
     {
       BUGMSG(D_NORMAL,"Can't get IRQ %d!\n",airq);
       return -ENODEV;
     }
-  irq2dev_map[airq]=dev;
   dev->irq=airq;
 
   /* reserve the I/O region - guaranteed to work by check_region */
@@ -315,7 +314,6 @@
   dev->priv = kmalloc(sizeof(struct arcnet_local), GFP_KERNEL);
   if (dev->priv == NULL)
     {
-      irq2dev_map[airq] = NULL;
       free_irq(airq,NULL);
       release_region(ioaddr,ARCNET_TOTAL_SIZE);
       return -ENOMEM;
@@ -905,7 +903,6 @@
 
   if (dev->irq)
     {
-      irq2dev_map[dev->irq] = NULL;
       free_irq(dev->irq,NULL);
     }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov