Commit f8433ac9 authored Apr 13, 2016 by Olof Johansson

Merge tag 'v4.7-rockchip-soc32-1' of...

Merge tag 'v4.7-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/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>

parents 4b051f92 26d51929

arch/arm/mach-rockchip/platsmp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message