Merge tag 'powerpc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

[linux.git] / drivers / of / fdt.c

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index f1c23aad951ec94985280987071c853e47e90a47..2cdf64d2456f8ff0498092aeeded2bf094a3165d 100644 (file)
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -947,8 +947,8 @@ int __init early_init_dt_scan_chosen_stdout(void)
                if (fdt_node_check_compatible(fdt, offset, match->compatible))
                        continue;
 
-               of_setup_earlycon(match, offset, options);
-               return 0;
+               if (of_setup_earlycon(match, offset, options) == 0)
+                       return 0;
        }
        return -ENODEV;
 }