Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / net / phy / mdio_bus.c

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 459443b572cef542a6757c1f02443f6ee42cbe7f..1b236bdf6b928d0dafa81c64ddcd3ac679c32e6c 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -60,8 +60,10 @@ int mdiobus_register(struct mii_bus *bus)
        for (i = 0; i < PHY_MAX_ADDR; i++) {
                struct phy_device *phydev;
 
-               if (bus->phy_mask & (1 << i))
+               if (bus->phy_mask & (1 << i)) {
+                       bus->phy_map[i] = NULL;
                        continue;
+               }
 
                phydev = get_phy_device(bus, i);