summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2013-12-30 12:09:47 -0600
committerRob Herring <robh@kernel.org>2013-12-30 12:09:47 -0600
commitf0082e3cf70e19dce4e96494078ec3ddb89550d3 (patch)
treef569318df8b2e9cf0047b0398891f670f8053d44
parent5d3ad8a63844f496f5c3a1f8bc3d25dc374c8360 (diff)
parent6f041e99fc7ba00e7e65a431527f9235d6b16463 (diff)
Merge remote-tracking branch 'grant/devicetree/merge' into dt-fixesdt-fixes-for-3.13
-rw-r--r--drivers/of/fdt.c12
1 files changed, 10 insertions, 2 deletions
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) {