From b3ebd8aa337978175814c3b82ff9c7316362ef12 Mon Sep 17 00:00:00 2001
From: roel kluin <roel.kluin@gmail.com>
Date: Sat, 1 Aug 2009 20:20:13 +0000
Subject: [PATCH] --- yaml --- r: 156343 b: refs/heads/master c:
 54706d99051582993037be5a076aa543fd7f1c38 h: refs/heads/master i:   156341:
 ab8b70fa4c0ca6ecfa81389bdd538b16eca8af71   156339:
 aefa51ab54c83eb532aa47912032621f5e292fe8   156335:
 4595b82944bbdb511fad8225ccffab1a616ea94e v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/s6gmac.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1a132050a882..1771b6b092ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b994b5a1b3cb5395598a08ef3bb0ac118d75c1b
+refs/heads/master: 54706d99051582993037be5a076aa543fd7f1c38
diff --git a/trunk/drivers/net/s6gmac.c b/trunk/drivers/net/s6gmac.c
index 5345e47b35ac..4525cbe8dd69 100644
--- a/trunk/drivers/net/s6gmac.c
+++ b/trunk/drivers/net/s6gmac.c
@@ -793,7 +793,7 @@ static inline int s6gmac_phy_start(struct net_device *dev)
 	struct s6gmac *pd = netdev_priv(dev);
 	int i = 0;
 	struct phy_device *p = NULL;
-	while ((!(p = pd->mii.bus->phy_map[i])) && (i < PHY_MAX_ADDR))
+	while ((i < PHY_MAX_ADDR) && (!(p = pd->mii.bus->phy_map[i])))
 		i++;
 	p = phy_connect(dev, dev_name(&p->dev), &s6gmac_adjust_link, 0,
 			PHY_INTERFACE_MODE_RGMII);