From: Minkyu Kang <mk7.kang@samsung.com>
Date: Fri, 30 Oct 2009 03:14:40 +0000 (+0900)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2010.09-rc1~28^2~7^2~41
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=0bf7de838096e804f0cece8f2d94905477381b6e;hp=4bc3d2afb380e78fdbb9c501d9a8da6d59eb178e

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

Conflicts:

	board/eukrea/cpu9260/cpu9260.c
	drivers/serial/serial_s5pc1xx.c
	include/asm-arm/arch-s5pc1xx/clock.h
	include/asm-arm/arch-s5pc1xx/gpio.h
	include/asm-arm/arch-s5pc1xx/pwm.h
	include/asm-arm/arch-s5pc1xx/uart.h
	include/configs/cpu9260.h
	include/configs/cpuat91.h
	include/configs/davinci_dm355evm.h
	include/linux/mtd/samsung_onenand.h
---

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index df7347897b..48e08c06c9 100644
--- 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;
 }