diff options
| author | Cormier, Jonathan <jcormier@criticallink.com> | 2014-05-21 13:08:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-05 14:44:56 -0400 |
| commit | 08be2836df0b07aac65fea583b762335569fd47a (patch) | |
| tree | 6b78dc1045b649ed3080b143c466a107bde9e578 /drivers | |
| parent | 64375014c499528d9df5ee37f78844823a9d21f2 (diff) | |
| download | blackbird-obmc-uboot-08be2836df0b07aac65fea583b762335569fd47a.tar.gz blackbird-obmc-uboot-08be2836df0b07aac65fea583b762335569fd47a.zip | |
phy: fix create_phy_by_mask for when its given an actual search mask
get_phy_id returns -EIO when it can't read from a phy at a given addr. This would cause
create_phy_by_mask to return prematurely before it had tested the other addresses in the provided mask.
Example usage:
Replace
phydev = phy_connect(bus, phy_addr, dev, phy_if)
with
phydev = phy_find_by_mask(bus, phy_mask, phy_if)
if (phydev)
phy_connect_dev(phydev, dev);
Signed-off-by: Cormier, Jonathan <jcormier@criticallink.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/phy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 230ed97dd1..aac85c4d09 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -609,10 +609,8 @@ static struct phy_device *create_phy_by_mask(struct mii_dev *bus, while (phy_mask) { int addr = ffs(phy_mask) - 1; int r = get_phy_id(bus, addr, devad, &phy_id); - if (r < 0) - return ERR_PTR(r); /* If the PHY ID is mostly f's, we didn't find anything */ - if ((phy_id & 0x1fffffff) != 0x1fffffff) + if (r == 0 && (phy_id & 0x1fffffff) != 0x1fffffff) return phy_device_create(bus, addr, phy_id, interface); phy_mask &= ~(1 << addr); } |
