diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-10-26 10:23:13 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-10-26 10:23:13 +0100 |
| commit | dd037f7a4f779bdfa9984b0db74a1bcdf7170fe9 (patch) | |
| tree | ca7e06ab2c6ebd83269d24542b0881e622f314da /drivers/net/smc911x.c | |
| parent | 4bd4413ae52e40d8e4c4e801b8d6bc3daf3229e3 (diff) | |
| parent | f3ee25859e3920ee7c7cc519a3e6f60d70d7a53f (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Conflicts:
Makefile
Diffstat (limited to 'drivers/net/smc911x.c')
| -rw-r--r-- | drivers/net/smc911x.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index b106ec973..df7347897 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -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; } |