Revert "net: au1000_eth: fix PHY detection"

This reverts commit a2f27217e4.

I applied the wrong version of this.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2016-06-10 23:34:24 -07:00
parent a2f27217e4
commit 86c5fe4c93

View File

@ -508,12 +508,13 @@ static int au1000_mii_probe(struct net_device *dev)
/* find the first (lowest address) PHY /* find the first (lowest address) PHY
* on the current MAC's MII bus * on the current MAC's MII bus
*/ */
for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) { for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++)
phydev = mdiobus_get_phy(aup->mii_bus, phy_addr); if (mdiobus_get_phy(aup->mii_bus, aup->phy_addr)) {
if (phydev && !aup->phy_search_highest_addr) phydev = mdiobus_get_phy(aup->mii_bus, aup->phy_addr);
/* break out with first one found */ if (!aup->phy_search_highest_addr)
break; /* break out with first one found */
} break;
}
if (aup->phy1_search_mac0) { if (aup->phy1_search_mac0) {
/* try harder to find a PHY */ /* try harder to find a PHY */