Merge tag 'v4.7-rockchip-soc32-1' of git://git.kernel.org/pub/scm/lin…

…ux/kernel/git/mmind/linux-rockchip into next/cleanup

Fix for a sparse build warning in the smp code.

* tag 'v4.7-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: Fix use of plain integer as NULL pointer

Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/mach-rockchip/platsmp.c

@@ -65,7 +65,7 @@ static struct reset_control *rockchip_get_core_reset(int cpu)
 	if (dev)
 		np = dev->of_node;
 	else
-		np = of_get_cpu_node(cpu, 0);
+		np = of_get_cpu_node(cpu, NULL);
 
 	return of_reset_control_get(np, NULL);
 }