Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / common / fdt_support.c

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 324d6b9019102be0bebbb19846f6df2507b3e737..7927a83b896988441d3358a0071c55c26c4c2bb5 100644 (file)
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -217,15 +217,15 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end)
        int is_u64;
        uint64_t addr, size;
 
+       /* just return if the size of initrd is zero */
+       if (initrd_start == initrd_end)
+               return 0;
+
        /* find or create "/chosen" node. */
        nodeoffset = fdt_find_or_add_subnode(fdt, 0, "chosen");
        if (nodeoffset < 0)
                return nodeoffset;
 
-       /* just return if initrd_start/end aren't valid */
-       if ((initrd_start == 0) || (initrd_end == 0))
-               return 0;
-
        total = fdt_num_mem_rsv(fdt);
 
        /*