patch-2.4.0-test10 linux/drivers/net/hplance.c
Next file: linux/drivers/net/hydra.c
Previous file: linux/drivers/net/hp100.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Mon Oct 30 12:24:21 2000
- Orig file:
v2.4.0-test9/linux/drivers/net/hplance.c
- Orig date:
Mon Jun 19 13:30:58 2000
diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/hplance.c linux/drivers/net/hplance.c
@@ -106,15 +106,17 @@
struct hplance_private *lp;
int i;
- if (dev == NULL)
- dev = init_etherdev(0, sizeof(struct hplance_private));
- else
- {
- dev->priv = kmalloc(sizeof(struct hplance_private), GFP_KERNEL);
- if (dev->priv == NULL)
- return -ENOMEM;
- memset(dev->priv, 0, sizeof(struct hplance_private));
- }
+#ifdef MODULE
+ dev = init_etherdev(0, sizeof(struct hplance_private));
+ if (!dev)
+ return -ENOMEM;
+#else
+ dev->priv = kmalloc(sizeof(struct hplance_private), GFP_KERNEL);
+ if (dev->priv == NULL)
+ return -ENOMEM;
+ memset(dev->priv, 0, sizeof(struct hplance_private));
+#endif
+
printk("%s: HP LANCE; select code %d, addr", dev->name, scode);
/* reset the board */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)