diff options
| author |   Olof Johansson <olof@lixom.net> | 2016-04-13 15:27:05 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-04-13 15:27:05 -0700 |
| commit | f8433ac982fa2adb409797b3b8619e5980f6947a (patch) | |
| tree | bec1d02c4eb8296c2a04aa7e2c454a07a0870236 | |
| parent | Merge tag 'versatile-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup (diff) | |
| parent | ARM: rockchip: Fix use of plain integer as NULL pointer (diff) | |
| download | linux-dev-f8433ac982fa2adb409797b3b8619e5980f6947a.tar.xz linux-dev-f8433ac982fa2adb409797b3b8619e5980f6947a.zip | |
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>
| -rw-r--r-- | arch/arm/mach-rockchip/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index d42a07e33482..4d827a069d49 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/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); } |