diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-05-07 01:49:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-08 22:13:29 +0200 |
| commit | 058112c7efc9ef43bb511c137293dddbe6e42908 (patch) | |
| tree | c3c00dafaeaa95f78a3296f2cbd58bba92dd6613 /drivers/of | |
| parent | sierra_net: keep status interrupt URB active (diff) | |
| download | linux-058112c7efc9ef43bb511c137293dddbe6e42908.tar.xz linux-058112c7efc9ef43bb511c137293dddbe6e42908.zip | |
net: of_mdio: fix behavior on missing phy device
of_mdiobus_register creates a phy_device even if get_phy_device failed
to create it previously. This causes indefinite polling on non-existent
PHYs. This fix makes of_mdio_register rely on get_phy_device to
properly create the device or fail otherwise.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/of_mdio.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index 23049aeca662..d5a57a9e329c 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -84,13 +84,10 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) phy = get_phy_device(mdio, addr, is_c45); if (!phy || IS_ERR(phy)) { - phy = phy_device_create(mdio, addr, 0, false, NULL); - if (!phy || IS_ERR(phy)) { - dev_err(&mdio->dev, - "error creating PHY at address %i\n", - addr); - continue; - } + dev_err(&mdio->dev, + "cannot get PHY at address %i\n", + addr); + continue; } /* Associate the OF node with the device structure so it |