Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / drivers / net / smc911x.c

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 18a729cfbcab8af2352c1700460f8af201a763a6..48e08c06c9c13a6a74220852a4303c8422261d8f 100644 (file)
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -146,10 +146,9 @@ static void smc911x_enable(struct eth_device *dev)
 
 static int smc911x_init(struct eth_device *dev, bd_t * bd)
 {
-       printf(DRIVERNAME ": initializing\n");
+       struct chip_id *id = dev->priv;
 
-       if (smc911x_detect_chip(dev))
-               goto err_out;
+        printf(DRIVERNAME ": detected %s controller\n", id->name);
 
        smc911x_reset(dev);
 
@@ -162,9 +161,6 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd)
        smc911x_enable(dev);
 
        return 0;
-
-err_out:
-       return -1;
 }
 
 static int smc911x_send(struct eth_device *dev,
@@ -253,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;
@@ -268,6 +270,12 @@ 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;
 }