aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2013-08-28 16:24:17 -0400
committerGrant Likely <grant.likely@linaro.org>2013-08-29 16:40:31 -0400
commit92d31610aac907c046f0e9c0f888c30415f20936 (patch)
treed1f063862d84419b46795073e74357488b449011 /drivers/of
parentd9fe0039c4247383c2783923a3860227813b4d82 (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>
Diffstat (limited to 'drivers/of')
-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 d49b3e8159bb..8263d2da3252 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -202,7 +202,6 @@ static unsigned long unflatten_dt_node(struct boot_param_header *blob,
202 __alignof__(struct device_node)); 202 __alignof__(struct device_node));
203 if (allnextpp) { 203 if (allnextpp) {
204 char *fn; 204 char *fn;
205 memset(np, 0, sizeof(*np));
206 np->full_name = fn = ((char *)np) + sizeof(*np); 205 np->full_name = fn = ((char *)np) + sizeof(*np);
207 if (new_format) { 206 if (new_format) {
208 /* rebuild full path for new format */ 207 /* rebuild full path for new format */