Commit 31092e59 authored by Stephen Hemminger's avatar Stephen Hemminger

[NET]: No need for alloc_divert_blk in Space.c

parent f3b65b77
...@@ -125,22 +125,14 @@ static int __init probe_list(struct net_device *dev, struct devprobe *plist) ...@@ -125,22 +125,14 @@ static int __init probe_list(struct net_device *dev, struct devprobe *plist)
{ {
struct devprobe *p = plist; struct devprobe *p = plist;
unsigned long base_addr = dev->base_addr; unsigned long base_addr = dev->base_addr;
int ret;
while (p->probe != NULL) { while (p->probe != NULL) {
if (base_addr && p->probe(dev) == 0) { /* probe given addr */ if (base_addr && p->probe(dev) == 0) /* probe given addr */
ret = alloc_divert_blk(dev);
if (ret)
return ret;
return 0; return 0;
} else if (p->status == 0) { /* has autoprobe failed yet? */ else if (p->status == 0) { /* has autoprobe failed yet? */
p->status = p->probe(dev); /* no, try autoprobe */ p->status = p->probe(dev); /* no, try autoprobe */
if (p->status == 0) { if (p->status == 0)
ret = alloc_divert_blk(dev);
if (ret)
return ret;
return 0; return 0;
}
} }
p++; p++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment