]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
of: Use NULL for pointers
authorThierry Reding <treding@nvidia.com>
Wed, 2 Apr 2014 07:47:01 +0000 (09:47 +0200)
committerGrant Likely <grant.likely@linaro.org>
Thu, 22 May 2014 23:40:25 +0000 (08:40 +0900)
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

drivers/of/fdt.c

index a6f83ea107ae03f8c1d71db45548a015dca6794b..d429826b61a507e504a8356be08c7c728a789cf3 100644 (file)
@@ -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);