Browse Source

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

Rob Herring 11 years ago
parent
commit
f0082e3cf7
1 changed files with 10 additions and 2 deletions
  1. 10 2
      drivers/of/fdt.c

+ 10 - 2
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) {