Commit d2d3d7cd authored Apr 02, 2014 by Thierry Reding Committed by Grant Likely May 23, 2014

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: Thierry Reding <treding@nvidia.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>

Conflicts:
	drivers/of/fdt.c

parent ba52464a

drivers/of/fdt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);