sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

net: cpsw: ignore error on slave setup 

The CPSW has two slaves. When one of them fails to setup continue
anyway with the other one. This fixes a crash in the beaglebone black
which only has one slave connected. The code doesn't find a phy on
the second slave and bails out, but the error path is broken: It frees
the private data structures which contains used resources.

Reported-by: Philippe Leduc <ledphilippe@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2015-01-06 15:06:39 +01:00
parent fec4b79449
commit b2568de82d
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/cpsw.c
View File

@ -910,6 +910,16 @@ static int cpsw_slave_setup(struct cpsw_slave *slave, int slave_num,
struct eth_device *edev = &slave->edev;
struct device_d *dev = &slave->dev;
int ret;
struct phy_device *phy;
phy = mdiobus_scan(&priv->miibus, priv->slaves[slave_num].phy_id);
if (IS_ERR(phy))
return PTR_ERR(phy);
phy->dev.device_node = priv->slaves[slave_num].dev.device_node;
ret = phy_register_device(phy);
if (ret)
return ret;
sprintf(dev->name, "cpsw-slave");
dev->id = slave->slave_num;
@ -1199,22 +1209,11 @@ int cpsw_probe(struct device_d *dev)
mdiobus_register(&priv->miibus);
for (i = 0; i < priv->num_slaves; i++) {
struct phy_device *phy;
phy = mdiobus_scan(&priv->miibus, priv->slaves[i].phy_id);
if (IS_ERR(phy)) {
ret = PTR_ERR(phy);
goto out;
}
phy->dev.device_node = priv->slaves[i].dev.device_node;
ret = phy_register_device(phy);
if (ret)
goto out;
ret = cpsw_slave_setup(&priv->slaves[i], i, priv);
if (ret)
goto out;
if (ret) {
dev_err(dev, "Failed to setup slave %d: %s\n", i, strerror(-ret));
continue;
}
}
return 0;