From d2d3d7cd81e90e1ffac1a6eed7b3edcbf11f4c97 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 2 Apr 2014 09:47:01 +0200 Subject: 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 Signed-off-by: Grant Likely Conflicts: drivers/of/fdt.c --- drivers/of/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/of') diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index a6f83ea107ae..d429826b61a5 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -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); -- cgit v1.2.3