Commit 18ee4ed9 authored Apr 02, 2014 by Thierry Reding Committed by Joonwoo Park Aug 15, 2014

of: Use NULL for pointers



Commit 4485681939b9 (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
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Git-commit: d2d3d7cd81e90e1ffac1a6eed7b3edcbf11f4c97
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>

parent 22c4e959

drivers/of/fdt.c

+1 −1

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