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 c50758e53208ecb75cd4e081ef2dd94293d179cd..613d9028f0edfa878e5653c33388b124b5b079bd 100644 (file)
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -270,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;
 }