patch-2.1.60 linux/drivers/net/arc-rimi.c

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

diff -u --recursive --new-file v2.1.59/linux/drivers/net/arc-rimi.c linux/drivers/net/arc-rimi.c
@@ -178,12 +178,11 @@
   int mirror_size;
 
   /* reserve the irq */
-  if (request_irq(airq,&arcnet_interrupt,0,"arcnet (RIM I)",NULL))
+  if (request_irq(airq,&arcnet_interrupt,0,"arcnet (RIM I)",dev))
     {
       BUGMSG(D_NORMAL,"Can't get IRQ %d!\n",airq);
       return -ENODEV;
     }
-  irq2dev_map[airq]=dev;
   dev->irq=airq;
 
   dev->base_addr=0;
@@ -221,7 +220,6 @@
   dev->priv = kmalloc(sizeof(struct arcnet_local), GFP_KERNEL);
   if (dev->priv == NULL)
     {
-      irq2dev_map[airq] = NULL;
       free_irq(airq,NULL);
       return -ENOMEM;
     }
@@ -792,7 +790,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