diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-16 12:51:52 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-16 12:51:52 +0900 |
| commit | 13beb8851e931b3cfb3403c3a62bfee9ab27a60c (patch) | |
| tree | 6993a8ef1558050d4d41e22fd656ec3e4f61f99a /drivers/of/fdt.c | |
| parent | ceafc84623c8ef94c13a87363277a595988b2b79 (diff) | |
| parent | a317907a68af5f1509b1b38e3bf378a5178f1c3a (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
Conflicts:
drivers/of/base.c
drivers/of/fdt.c
Diffstat (limited to 'drivers/of/fdt.c')
| -rw-r--r-- | drivers/of/fdt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 4911158cba8a..fa951c30a1c5 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -157,7 +157,6 @@ static void * unflatten_dt_node(struct boot_param_header *blob, __alignof__(struct device_node)); if (allnextpp) { char *fn; - memset(np, 0, sizeof(*np)); np->full_name = fn = ((char *)np) + sizeof(*np); if (new_format) { /* rebuild full path for new format */ @@ -339,6 +338,8 @@ static void __unflatten_device_tree(struct boot_param_header *blob, memset((void *)mem, 0, size); + memset((void *)mem, 0, size); + ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef); pr_debug(" unflattening %p...\n", mem); |