diff --git a/[refs] b/[refs] index 438cd42a4e77..010202ecccb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21f3fe2f7ab57832ea1fc7f719ec7e167b7ad80e +refs/heads/master: 96ebc3bfb6ddedd5a400d5653b50551d5a3de439 diff --git a/trunk/arch/powerpc/boot/devtree.c b/trunk/arch/powerpc/boot/devtree.c index e1b8122b4393..549463bf5eec 100644 --- a/trunk/arch/powerpc/boot/devtree.c +++ b/trunk/arch/powerpc/boot/devtree.c @@ -100,12 +100,14 @@ void __dt_fixup_mac_addresses(u32 startindex, ...) devp = find_node_by_prop_value(NULL, "linux,network-index", (void*)&index, sizeof(index)); - printf("ENET%d: local-mac-address <-" - " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index, - addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); + if (devp) { + printf("ENET%d: local-mac-address <-" + " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index, + addr[0], addr[1], addr[2], + addr[3], addr[4], addr[5]); - if (devp) setprop(devp, "local-mac-address", addr, 6); + } index++; }