net: netcp: Fix ethss driver probe issue

Murali Karicheri · davem330 · commit 1f43f400a2cb · 2019-02-18T17:49:24.000-08:00
Recent commit below has introduced a bug in netcp driver that causes the ethss driver probe failure and thus break the networking function on K2 SoCs such as K2HK, K2L, K2E etc. This patch fixes the issue to restore networking on the above SoCs. Fixes: 21c328d ("net: ethernet: Convert to using %pOFn instead of device_node.name") Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
@@ -259,7 +259,7 @@ static int netcp_module_probe(struct netcp_device *netcp_device,
 		const char *name;
 		char node_name[32];
 
-		if (of_property_read_string(node, "label", &name) < 0) {
+		if (of_property_read_string(child, "label", &name) < 0) {
 			snprintf(node_name, sizeof(node_name), "%pOFn", child);
 			name = node_name;
 		}

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ static int netcp_module_probe(struct netcp_device *netcp_device,`
`259`	`259`	`const char *name;`
`260`	`260`	`char node_name[32];`
`261`	`261`
`262`		`- if (of_property_read_string(node, "label", &name) < 0) {`
	`262`	`+ if (of_property_read_string(child, "label", &name) < 0) {`
`263`	`263`	`snprintf(node_name, sizeof(node_name), "%pOFn", child);`
`264`	`264`	`name = node_name;`
`265`	`265`	`}`