From: Rob Herring <robh@kernel.org>
Date: Mon, 30 Dec 2013 18:09:47 +0000 (-0600)
Subject: Merge remote-tracking branch 'grant/devicetree/merge' into dt-fixes
X-Git-Tag: firefly_0821_release~176^2~4711^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f0082e3cf70e19dce4e96494078ec3ddb89550d3;hp=5d3ad8a63844f496f5c3a1f8bc3d25dc374c8360;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'grant/devicetree/merge' into dt-fixes
---

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 2fa024b97c43..758b4f8b30b7 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -922,8 +922,16 @@ void __init unflatten_device_tree(void)
  */
 void __init unflatten_and_copy_device_tree(void)
 {
-	int size = __be32_to_cpu(initial_boot_params->totalsize);
-	void *dt = early_init_dt_alloc_memory_arch(size,
+	int size;
+	void *dt;
+
+	if (!initial_boot_params) {
+		pr_warn("No valid device tree found, continuing without\n");
+		return;
+	}
+
+	size = __be32_to_cpu(initial_boot_params->totalsize);
+	dt = early_init_dt_alloc_memory_arch(size,
 		__alignof__(struct boot_param_header));
 
 	if (dt) {