ARM: move #ifdef to match the error handling code

Match the #ifdef ... #endif and the code,

   ret = do_something();
   if (ret)
           return ret;

This will make it easier to add more #ifdef'ed code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 7677358742e1bd3ee257495bbff71f67f2965cc4..76b75d8e4643ee9a018c216c15301de2ae15f3d4 100644 (file)
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -42,11 +42,14 @@ int arch_fixup_fdt(void *blob)
        }
 
        ret = fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
-#ifdef CONFIG_ARMV7_NONSEC
        if (ret)
                return ret;
 
+#ifdef CONFIG_ARMV7_NONSEC
        ret = psci_update_dt(blob);
+       if (ret)
+               return ret;
 #endif
-       return ret;
+
+       return 0;
 }