---

yaml --- r: 362581 b: refs/heads/master c: 91c4166 h: refs/heads/master i: 362579: 5c30052 v: v3
git-mirror · Apr 15, 2013 · 5f2e15f · 5f2e15f
1 parent a0e1bd3
commit 5f2e15f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee40a116ebf139f900c3d2e6febb8388738e96d0
+refs/heads/master: 91c4166c1a01c00b8bed74f7a7defa620071de88
diff --git a/trunk/drivers/net/ethernet/ti/cpsw.c b/trunk/drivers/net/ethernet/ti/cpsw.c
@@ -1380,7 +1380,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
 			memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);
 
 		if (data->dual_emac) {
-			if (of_property_read_u32(node, "dual_emac_res_vlan",
+			if (of_property_read_u32(slave_node, "dual_emac_res_vlan",
 						 &prop)) {
 				pr_err("Missing dual_emac_res_vlan in DT.\n");
 				slave_data->dual_emac_res_vlan = i+1;