summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ti/cpsw.c
diff options
context:
space:
mode:
authorBen Hutchings2016-06-21 02:16:31 +0200
committerDavid S. Miller2016-06-23 21:12:20 +0200
commit8658aaf2539795e0b58fe101ae61d989f81700ff (patch)
tree658bce06a2907b7c7558f28a751e108ee424d3af /drivers/net/ethernet/ti/cpsw.c
parentopenvswitch: Add packet len info to upcall. (diff)
downloadkernel-qcow2-linux-8658aaf2539795e0b58fe101ae61d989f81700ff.tar.gz
kernel-qcow2-linux-8658aaf2539795e0b58fe101ae61d989f81700ff.tar.xz
kernel-qcow2-linux-8658aaf2539795e0b58fe101ae61d989f81700ff.zip
ti_cpsw: Check for disabled child nodes
Dual MAC devices don't necessarily have both MACs wired up, so ignore those that are disabled. Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/cpsw.c')
-rw-r--r--drivers/net/ethernet/ti/cpsw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 83273288aefc..9c924f15cd03 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2014,7 +2014,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
if (ret)
dev_warn(&pdev->dev, "Doesn't have any child node\n");
- for_each_child_of_node(node, slave_node) {
+ for_each_available_child_of_node(node, slave_node) {
struct cpsw_slave_data *slave_data = data->slave_data + i;
const void *mac_addr = NULL;
int lenp;