diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/net/3c503.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/net/3c503.c')
| -rw-r--r-- | drivers/net/3c503.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c index 3dc9b42f0..3aa8cc8f8 100644 --- a/drivers/net/3c503.c +++ b/drivers/net/3c503.c @@ -190,6 +190,9 @@ el2_probe1(struct net_device *dev, int ioaddr) if (dev == NULL) { printk("3c503.c: Passed a NULL device.\n"); dev = init_etherdev(0, 0); + + if (!dev) + return -ENOMEM; } if (ei_debug && version_printed++ == 0) |