diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-20 15:20:02 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-21 14:10:35 +0200 |
| commit | b90dc180542602cb7581cff56f21fc90eb66fa68 (patch) | |
| tree | ec7b2c4d75fa813ea67be82b2a9ffae5608583cb /drivers | |
| parent | 3fcb734639b50f2b821585f2ab61bfc995f9feed (diff) | |
| download | barebox-b90dc180542602cb7581cff56f21fc90eb66fa68.tar.gz barebox-b90dc180542602cb7581cff56f21fc90eb66fa68.tar.xz | |
net: phy: move setting of phy_map to phy_register_device
The phy_map should be valid once a phy_device is registered. This
allows registering phys outside of mdiobus_scan.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 2 | ||||
| -rw-r--r-- | drivers/net/phy/phy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 895ead0a5c..5c4dea4e88 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -114,8 +114,6 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) if (IS_ERR(phydev)) return phydev; - bus->phy_map[addr] = phydev; - return phydev; } EXPORT_SYMBOL(mdiobus_scan); diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index a8a8a2ce55..1e26e455f3 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -245,6 +245,8 @@ int phy_register_device(struct phy_device* dev) if (ret) return ret; + dev->bus->phy_map[dev->addr] = dev; + dev->registered = 1; if (dev->dev.driver) |