X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Fof%2Ffdt.c;h=c89d5d231a0e30eb4d1a458523e8ef4723b5e6d3;hb=e46cae441824999c858d482ca1f661cf4292c02f;hp=55f1b839114924aeaae2baf1f10a2db145037cca;hpb=539294b76af8922297702a7ebb8cafe68f7e5376;p=cascardo%2Flinux.git

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 55f1b8391149..c89d5d231a0e 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -517,7 +517,7 @@ static void *__unflatten_device_tree(const void *blob,
 		pr_warning("End of tree marker overwritten: %08x\n",
 			   be32_to_cpup(mem + size));
 
-	if (detached) {
+	if (detached && mynodes) {
 		of_node_set_flag(*mynodes, OF_DETACHED);
 		pr_debug("unflattened tree is detached\n");
 	}
@@ -924,7 +924,7 @@ static inline void early_init_dt_check_for_initrd(unsigned long node)
 
 #ifdef CONFIG_SERIAL_EARLYCON
 
-static int __init early_init_dt_scan_chosen_serial(void)
+int __init early_init_dt_scan_chosen_stdout(void)
 {
 	int offset;
 	const char *p, *q, *options = NULL;
@@ -968,15 +968,6 @@ static int __init early_init_dt_scan_chosen_serial(void)
 	}
 	return -ENODEV;
 }
-
-static int __init setup_of_earlycon(char *buf)
-{
-	if (buf)
-		return 0;
-
-	return early_init_dt_scan_chosen_serial();
-}
-early_param("earlycon", setup_of_earlycon);
 #endif
 
 /**