---

yaml --- r: 342220 b: refs/heads/master c: 16d4770 h: refs/heads/master v: v3
git-mirror · Oct 30, 2012 · 8880161 · 8880161
1 parent 38e1fec
commit 8880161
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bde51cb16e3b3f505b465cab263adc3a57d6c0a
+refs/heads/master: 16d477018bdddcf87a908310ac9343734e26cde0
diff --git a/trunk/arch/arm/mach-mxs/mach-mxs.c b/trunk/arch/arm/mach-mxs/mach-mxs.c
@@ -176,8 +176,12 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
 		np = of_find_compatible_node(from, NULL, "fsl,imx28-fec");
 		if (!np)
 			return;
+
 		from = np;
 
+		if (of_get_property(np, "local-mac-address", NULL))
+			continue;
+
 		newmac = kzalloc(sizeof(*newmac) + 6, GFP_KERNEL);
 		if (!newmac)
 			return;