diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-02-12 23:33:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-13 18:25:14 -0500 |
| commit | 89e101729be4cacd5847fef7e7c99680772c6e3c (patch) | |
| tree | e051ced724596d42fb4d69f3693e9af9a185e886 | |
| parent | 9b2b6a2d669c909dd0b125fc834da94bcfc0aee7 (diff) | |
| download | op-kernel-dev-89e101729be4cacd5847fef7e7c99680772c6e3c.zip op-kernel-dev-89e101729be4cacd5847fef7e7c99680772c6e3c.tar.gz | |
net: cpsw: catch of_get_phy_mode failing and propagate error
It's wrong if the device tree doesn't provide a phy-mode property for
the cpsw slaves as it is documented to be required in
Documentation/devicetree/bindings/net/cpsw.txt.
Anyhow it's nice to catch that problem, still more as it used to work
without this property up to commit 388367a5a9fb (drivers: net: cpsw: use
cpsw-phy-sel driver to configure phy mode) which is in v3.13-rc1.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 1d860ce..542c511 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1896,6 +1896,11 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN); slave_data->phy_if = of_get_phy_mode(slave_node); + if (slave_data->phy_if < 0) { + pr_err("Missing or malformed slave[%d] phy-mode property\n", + i); + return slave_data->phy_if; + } if (data->dual_emac) { if (of_property_read_u32(slave_node, "dual_emac_res_vlan", |
