Skip to content

Commit

Permalink
of: Use NULL for pointers
Browse files Browse the repository at this point in the history
Commit 4485681 (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: Thierry Reding <treding@nvidia.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>

Conflicts:
	drivers/of/fdt.c
  • Loading branch information
Thierry Reding authored and Grant Likely committed May 22, 2014
1 parent ba52464 commit d2d3d7c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/of/fdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ static void __unflatten_device_tree(void *blob,

/* First pass, scan for size */
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);

pr_debug(" size is %lx, allocating...\n", size);
Expand Down

0 comments on commit d2d3d7c

Please sign in to comment.