diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/net/sgiseeq.c | |
parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/net/sgiseeq.c')
-rw-r--r-- | drivers/net/sgiseeq.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c index 53a223151..2992457ae 100644 --- a/drivers/net/sgiseeq.c +++ b/drivers/net/sgiseeq.c @@ -599,13 +599,9 @@ int sgiseeq_init(struct net_device *dev, struct sgiseeq_regs *sregs, int i; struct sgiseeq_private *sp; - if (dev == NULL) { - dev = init_etherdev(0, sizeof(struct sgiseeq_private)); - } else { - dev->priv = (struct sgiseeq_private *) get_free_page(GFP_KERNEL); - if (dev->priv == NULL) - return -ENOMEM; - } + dev->priv = (struct sgiseeq_private *) get_free_page(GFP_KERNEL); + if (dev->priv == NULL) + return -ENOMEM; if (!version_printed++) printk(version); |