commit f763be224fa78893384416734419d8e052c1c5ef
author Tom Rini <trini@ti.com> Tue Feb 04 11:48:39 2014 -0500
committer Tom Rini <trini@ti.com> Tue Feb 04 11:51:20 2014 -0500
tree b69ff86bfbf95516f1609a214164596492eb5213
parent 9c1d0e9f16b5718da47018da0a5c3e0eafbff81b
parent 6f9b93723a39dc6d6231c842bb0166bd6258ee53

Merge branch 'net' of git://www.denx.de/git/u-boot-microblaze

drivers/net/xilinx_axi_emac.c

diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index bb5044b..262b67b 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -261,6 +261,10 @@
 		       phydev->dev->name);
 		return 0;
 	}
+	if (!phydev->link) {
+		printf("%s: No link.\n", phydev->dev->name);
+		return 0;
+	}
 
 	switch (phydev->speed) {
 	case 1000:

drivers/net/zynq_gem.c

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 6a017a8..381bca4 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -339,6 +339,11 @@
 	phy_config(phydev);
 	phy_startup(phydev);
 
+	if (!phydev->link) {
+		printf("%s: No link.\n", phydev->dev->name);
+		return -1;
+	}
+
 	switch (phydev->speed) {
 	case SPEED_1000:
 		writel(ZYNQ_GEM_NWCFG_INIT | ZYNQ_GEM_NWCFG_SPEED1000,