diff options
author | Thierry Reding <treding@nvidia.com> | 2014-04-02 03:47:01 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-05-22 19:40:25 -0400 |
commit | d2d3d7cd81e90e1ffac1a6eed7b3edcbf11f4c97 (patch) | |
tree | 08fa8eb7869119d734422c35d85201baa91524eb /drivers/of/fdt.c | |
parent | ba52464a629fab2493925007b00f2ca65d02ed4e (diff) |
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
Diffstat (limited to 'drivers/of/fdt.c')
-rw-r--r-- | drivers/of/fdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
324 | 324 | ||
325 | /* First pass, scan for size */ | 325 | /* First pass, scan for size */ |
326 | start = 0; | 326 | start = 0; |
327 | size = (unsigned long)unflatten_dt_node(blob, 0, &start, NULL, NULL, 0); | 327 | size = (unsigned long)unflatten_dt_node(blob, NULL, &start, NULL, NULL, 0); |
328 | size = ALIGN(size, 4); | 328 | size = ALIGN(size, 4); |
329 | 329 | ||
330 | pr_debug(" size is %lx, allocating...\n", size); | 330 | pr_debug(" size is %lx, allocating...\n", size); |