1 files changed, 5 insertions, 5 deletions

diff --git a/scripts/dtc/libfdt/fdt_rw.c b/scripts/dtc/libfdt/fdt_rw.c
index 24437dfc32b8..70adec6c371b 100644
--- a/scripts/dtc/libfdt/fdt_rw.c
+++ b/scripts/dtc/libfdt/fdt_rw.c
@@ -84,9 +84,9 @@ static int _fdt_rw_check_header(void *fdt)
 
 #define FDT_RW_CHECK_HEADER(fdt) \
         { \
-                int err; \
-                if ((err = _fdt_rw_check_header(fdt)) != 0) \
-                        return err; \
+                int __err; \
+                if ((__err = _fdt_rw_check_header(fdt)) != 0) \
+                        return __err; \
         }
 
 static inline int _fdt_data_size(void *fdt)
@@ -339,7 +339,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,
         int nodelen;
         int err;
         uint32_t tag;
-        uint32_t *endtag;
+        fdt32_t *endtag;
 
         FDT_RW_CHECK_HEADER(fdt);
 
@@ -366,7 +366,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,
         nh->tag = cpu_to_fdt32(FDT_BEGIN_NODE);
         memset(nh->name, 0, FDT_TAGALIGN(namelen+1));
         memcpy(nh->name, name, namelen);
-        endtag = (uint32_t *)((char *)nh + nodelen - FDT_TAGSIZE);
+        endtag = (fdt32_t *)((char *)nh + nodelen - FDT_TAGSIZE);
         *endtag = cpu_to_fdt32(FDT_END_NODE);
 
         return offset;