diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 12:04:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 12:04:02 -0800 |
| commit | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (patch) | |
| tree | 34f0675602943161c3dc1340d6c8c449283b681c /drivers/net/phy/mdio_bus.c | |
| parent | 537a95d9351f41cc3c24ddb2a646aedd6debb21b (diff) | |
| parent | f896424cbc61225e8f029fe23e5aae3e32103229 (diff) | |
| download | blackbird-op-linux-70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab.tar.gz blackbird-op-linux-70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/phy/mdio_bus.c')
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index ad93b0da87f0..5eab9c42a111 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -61,6 +61,9 @@ 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)) + continue; + phydev = get_phy_device(bus, i); if (IS_ERR(phydev)) |
