summaryrefslogtreecommitdiffstats
path: root/drivers/net/cpsw.c
diff options
context:
space:
mode:
authorTeresa Gámez <t.gamez@phytec.de>2014-10-10 11:14:29 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-10-14 11:19:17 +0200
commitc1450014643fef9b170f070dc2fd594e02509955 (patch)
tree72ed34b2f8f3390fd859bd6aefa8da62376cbec8 /drivers/net/cpsw.c
parent6b62498f50c6925a17846cb6f4b06956046eda6a (diff)
downloadbarebox-c1450014643fef9b170f070dc2fd594e02509955.tar.gz
barebox-c1450014643fef9b170f070dc2fd594e02509955.tar.xz
net: cpsw: Fix probe for one port ethernet
If only one port is pinned out, probe fails as the second port phy_id is not found. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/cpsw.c')
-rw-r--r--drivers/net/cpsw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index 50890c469a..d3cc0e930b 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -1070,7 +1070,7 @@ static int cpsw_probe_dt(struct cpsw_priv *priv)
return ret;
}
- if (!strncmp(child->name, "slave", 5)) {
+ if (i < priv->num_slaves && !strncmp(child->name, "slave", 5)) {
struct cpsw_slave *slave = &priv->slaves[i];
uint32_t phy_id[2];
@@ -1087,7 +1087,7 @@ static int cpsw_probe_dt(struct cpsw_priv *priv)
}
}
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < priv->num_slaves; i++) {
struct cpsw_slave *slave = &priv->slaves[i];
cpsw_gmii_sel_am335x(slave);