common: image-android-dt: Fix logic in print fdt info routine
authorSam Protsenko <semen.protsenko@linaro.org>
Mon, 5 Aug 2019 17:11:03 +0000 (20:11 +0300)
committerTom Rini <trini@konsulko.com>
Wed, 7 Aug 2019 19:31:05 +0000 (15:31 -0400)
Do not attempt to print fdt info if root node wasn't found.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
common/image-android-dt.c

index 691682617932ec4758bc93a1896d7f66d0b158ff..a2d52df4a2a9e23930fad1be17bee28f16c75399 100644 (file)
@@ -78,17 +78,18 @@ static void android_dt_print_fdt_info(const struct fdt_header *fdt)
 {
        u32 fdt_size;
        int root_node_off;
-       const char *compatible = NULL;
+       const char *compatible;
 
-       fdt_size = fdt_totalsize(fdt);
        root_node_off = fdt_path_offset(fdt, "/");
        if (root_node_off < 0) {
                printf("Error: Root node not found\n");
-       } else {
-               compatible = fdt_getprop(fdt, root_node_off, "compatible",
-                                        NULL);
+               return;
        }
 
+       fdt_size = fdt_totalsize(fdt);
+       compatible = fdt_getprop(fdt, root_node_off, "compatible",
+                                NULL);
+
        printf("           (FDT)size = %d\n", fdt_size);
        printf("     (FDT)compatible = %s\n",
               compatible ? compatible : "(unknown)");