diff options
| author | Boris BREZILLON <b.brezillon@overkiz.com> | 2013-08-27 14:36:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-29 21:21:45 +0200 |
| commit | 7daa78e352fec0f638e1e665365779678845fd66 (patch) | |
| tree | cb11d42d763faf52ca47f20fb58fb5d5db148fc8 /drivers/net/ethernet/cadence | |
| parent | bridge: inherit slave devices needed_headroom (diff) | |
| download | linux-7daa78e352fec0f638e1e665365779678845fd66.tar.xz linux-7daa78e352fec0f638e1e665365779678845fd66.zip | |
net/cadence/macb: fix invalid 0 return if no phy is discovered on mii init
Replace misleading -1 (-EPERM) by a more appropriate return code (-ENXIO)
in macb_mii_probe function.
Save macb_mii_probe return before branching to err_out_unregister to avoid
erronous 0 return.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.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')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index fe06ab0f7375..7660c45a2eb9 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -276,7 +276,7 @@ static int macb_mii_probe(struct net_device *dev) phydev = phy_find_first(bp->mii_bus); if (!phydev) { netdev_err(dev, "no PHY found\n"); - return -1; + return -ENXIO; } pdata = dev_get_platdata(&bp->pdev->dev); @@ -379,9 +379,9 @@ int macb_mii_init(struct macb *bp) if (err) goto err_out_free_mdio_irq; - if (macb_mii_probe(bp->dev) != 0) { + err = macb_mii_probe(bp->dev); + if (err) goto err_out_unregister_bus; - } return 0; |