From: Kim Phillips <kim.phillips@freescale.com>
Date: Wed, 27 Feb 2008 22:08:22 +0000 (-0600)
Subject: net: uec_phy: actually increment the timeout counter
X-Git-Tag: v1.3.2~13^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f30b6154f16f5ffa4a9f5bfca5e114d72b6ef675;p=oweals%2Fu-boot.git

net: uec_phy: actually increment the timeout counter

allow u-boot to recover (and, e.g., switch to another interface) in the
case where a PHY does not report autonegotiation is complete within its
two second timeout value.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
---

diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index cf9921b37f..a42701c59b 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -290,6 +290,7 @@ static int genmii_update_link (struct uec_mii_info *mii_info)
 				return 0;
 			}
 
+			i++;
 			udelay(1000);	/* 1 ms */
 			status = phy_read(mii_info, PHY_BMSR);
 		}
@@ -577,7 +578,7 @@ void marvell_phy_interface_mode (struct eth_device *dev,
 	u16 status;
 
 	if (!uec->mii_info) {
-		printf ("%s: the PHY not intialized\n", __FUNCTION__);
+		printf ("%s: the PHY not initialized\n", __FUNCTION__);
 		return;
 	}
 	mii_info = uec->mii_info;