1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index c2b08dcdbc53..c8be32644c85 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -199,10 +199,10 @@ static unsigned long unflatten_dt_node(struct boot_param_header *blob,
         np = unflatten_dt_alloc(&mem, sizeof(struct device_node) + allocl,
                                 __alignof__(struct device_node));
         if (allnextpp) {
+                char *fn;
                 memset(np, 0, sizeof(*np));
-                np->full_name = ((char *)np) + sizeof(struct device_node);
+                np->full_name = fn = ((char *)np) + sizeof(*np);
                 if (new_format) {
-                        char *fn = np->full_name;
                         /* rebuild full path for new format */
                         if (dad && dad->parent) {
                                 strcpy(fn, dad->full_name);
@@ -216,9 +216,9 @@ static unsigned long unflatten_dt_node(struct boot_param_header *blob,
                                 fn += strlen(fn);
                         }
                         *(fn++) = '/';
-                        memcpy(fn, pathp, l);
-                } else
-                        memcpy(np->full_name, pathp, l);
+                }
+                memcpy(fn, pathp, l);
+
                 prev_pp = &np->properties;
                 **allnextpp = np;
                 *allnextpp = &np->allnext;