hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Boris BREZILLON 2013-08-27 14:36:14 +02:00 committed by David S. Miller
parent fd094808a0
commit 7daa78e352
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/cadence/macb.c
View File

@ -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;