mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
ARM: OMAP3: Refactors the SM911x driver
Move the test up in the function to not hang on systems without ethernet. Signed-off-by: Steve Sakoman <sakoman@gmail.com> Acked-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
parent
f380737478
commit
4bc3d2afb3
1 changed files with 6 additions and 6 deletions
|
@ -249,6 +249,12 @@ int smc911x_initialize(u8 dev_num, int base_addr)
|
|||
|
||||
dev->iobase = base_addr;
|
||||
|
||||
/* Try to detect chip. Will fail if not present. */
|
||||
if (smc911x_detect_chip(dev)) {
|
||||
free(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
addrh = smc911x_get_mac_csr(dev, ADDRH);
|
||||
addrl = smc911x_get_mac_csr(dev, ADDRL);
|
||||
dev->enetaddr[0] = addrl;
|
||||
|
@ -264,12 +270,6 @@ int smc911x_initialize(u8 dev_num, int base_addr)
|
|||
dev->recv = smc911x_rx;
|
||||
sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num);
|
||||
|
||||
/* Try to detect chip. Will fail if not present. */
|
||||
if (smc911x_detect_chip(dev)) {
|
||||
free(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
eth_register(dev);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue