patch-2.4.3 linux/drivers/net/tokenring/ibmtr.c

• Lines: 41
• Date: Tue Mar 20 12:05:00 2001
• Orig file: v2.4.2/linux/drivers/net/tokenring/ibmtr.c
• Orig date: Wed Feb 21 18:20:29 2001

diff -u --recursive --new-file v2.4.2/linux/drivers/net/tokenring/ibmtr.c linux/drivers/net/tokenring/ibmtr.c
@@ -255,12 +255,16 @@
  *
  *	We expect ibmtr_probe to be called once for each device entry
  *	which references it.
+ *
+ *	Argument 'dev' should never be NULL.  If we are built into
+ *	the kernel, Space.c passed up a net_device.  If we are
+ *	-DMODULE, init_module allocates net_devices for us.
  */
  
 int __init ibmtr_probe(struct net_device *dev)
 {
         int i;
-        int base_addr = dev ? dev->base_addr : 0;
+        int base_addr = dev->base_addr;
 
         if (base_addr > 0x1ff) 
         { 
@@ -301,7 +305,7 @@
 
 #ifndef MODULE
 #ifndef PCMCIA
-	dev = init_trdev(dev,0);
+	dev = init_trdev(dev, 0);
 #endif
 #endif
 
@@ -1877,8 +1881,11 @@
 		mem[i] = 0;
 		dev_ibmtr[i] = NULL;
                 dev_ibmtr[i] = init_trdev(dev_ibmtr[i], 0);
-                if (dev_ibmtr[i] == NULL)
-                        return -ENOMEM;
+                if (dev_ibmtr[i] == NULL) {
+			if (i == 0)
+                        	return -ENOMEM;
+			break;
+		}
 
 	        dev_ibmtr[i]->base_addr = io[i];
 	        dev_ibmtr[i]->irq       = irq[i];