net: au1000_eth: fix PHY detection
authorManuel Lauss <manuel.lauss@gmail.com>
Fri, 10 Jun 2016 14:53:05 +0000 (16:53 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Jun 2016 06:32:25 +0000 (23:32 -0700)
Commit 7f854420fbfe9d49afe2ffb1df052cfe8e215541
("phy: Add API for {un}registering an mdio device to a bus.")
broke PHY detection on this driver with a copy-paste bug:
The code is looking 32 times for a PHY at address 0.

Fixes ethernet on AMD DB1100/DB1500/DB1550 boards which have
their (autodetected) PHYs at address 31.

Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/amd/au1000_eth.c

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