diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2016-05-01 01:47:36 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-03 15:03:09 -0400 |
| commit | ce24c2b8a904753701fe4df313b4cbc2b0649e3e (patch) | |
| tree | 980a803e8bbc626b1a565b792b280c35d4621847 /drivers/net/ethernet/cadence/macb.c | |
| parent | 6dd745425807dc977bbea810ef703b935002fcc3 (diff) | |
| download | linux-ce24c2b8a904753701fe4df313b4cbc2b0649e3e.tar.gz | |
macb: fix mdiobus_scan() error check
Now mdiobus_scan() returns ERR_PTR(-ENODEV) instead of NULL if the PHY
device ID was read as all ones. As this was not an error before, this
value should be filtered out now in this driver.
Fixes: b74766a0a0fe ("phylib: don't return NULL from get_phy_device()")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence/macb.c')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 48a7d7dee846..898f06f9e286 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -458,7 +458,8 @@ static int macb_mii_init(struct macb *bp) struct phy_device *phydev; phydev = mdiobus_scan(bp->mii_bus, i); - if (IS_ERR(phydev)) { + if (IS_ERR(phydev) && + PTR_ERR(phydev) != -ENODEV) { err = PTR_ERR(phydev); break; } |