From 5f2e15f54cdd686375ace957012c1a1d1b675fda Mon Sep 17 00:00:00 2001 From: Mugunthan V N Date: Mon, 15 Apr 2013 07:31:28 +0000 Subject: [PATCH] --- yaml --- r: 362581 b: refs/heads/master c: 91c4166c1a01c00b8bed74f7a7defa620071de88 h: refs/heads/master i: 362579: 5c30052494f8a2696f1e057aaeda2519c8f5ebe8 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ti/cpsw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6756efa2c802..f95f4396701f 100644 --- 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 index 80cad06e5eb2..4781d3d8e182 100644 --- 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;