aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2013-08-28 21:24:17 +0100
committerMark Brown <broonie@kernel.org>2015-02-16 11:35:26 +0900
commit0087951fd2be8229cbdced18475a9f4c0ab23a1f (patch)
treea9d41b34d282d1a1bd0dfa52676331af7675135d
parent3a9560b1afb51dcf64eadc9f14ef56bee317862e (diff)
of/fdt: Remove duplicate memory clearing on FDT unflattening
Patch 9e4012752, "of: fdt: fix memory initialization for expanded DT" fixed incomplete clearing of memory when unflattening the device tree. However the code was already clearing some of the memory, it just wasn't doing so for all allocations. Now that the memory is cleared right at the point of allocation, the memset after unflatten_dt_alloc() is redundant. Remove it. Signed-off-by: Grant Likely <grant.likely@linaro.org> Acked-by: Wladislav Wiebe <wladislav.kw@gmail.com> (cherry picked from commit 92d31610aac907c046f0e9c0f888c30415f20936) Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/of/fdt.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index a1ebaecc8122..cafff538c850 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -201,7 +201,6 @@ static unsigned long 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 */