Commit d2d3d7cd authored by Thierry Reding's avatar Thierry Reding Committed by Grant Likely

of: Use NULL for pointers

Commit 44856819 (of/fdt: Clean up casting in unflattening path)
modified unflatten_dt_node() to take a void * for the mem parameter
instead of an unsigned long. One of the call sites wasn't updated.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>

Conflicts:
	drivers/of/fdt.c
parent ba52464a
...@@ -324,7 +324,7 @@ static void __unflatten_device_tree(void *blob, ...@@ -324,7 +324,7 @@ static void __unflatten_device_tree(void *blob,
/* First pass, scan for size */ /* First pass, scan for size */
start = 0; start = 0;
size = (unsigned long)unflatten_dt_node(blob, 0, &start, NULL, NULL, 0); size = (unsigned long)unflatten_dt_node(blob, NULL, &start, NULL, NULL, 0);
size = ALIGN(size, 4); size = ALIGN(size, 4);
pr_debug(" size is %lx, allocating...\n", size); pr_debug(" size is %lx, allocating...\n", size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment