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);