diff options
| author | Olof Johansson <olof@lixom.net> | 2016-04-13 18:27:05 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-04-13 18:27:05 -0400 |
| commit | f8433ac982fa2adb409797b3b8619e5980f6947a (patch) | |
| tree | bec1d02c4eb8296c2a04aa7e2c454a07a0870236 | |
| parent | 4b051f925c3a924ccb6e56f1768140d7f726db7b (diff) | |
| parent | 26d5192953d88d6231d173281848a1c61f9e5d34 (diff) | |
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) | |||
| 65 | if (dev) | 65 | if (dev) |
| 66 | np = dev->of_node; | 66 | np = dev->of_node; |
| 67 | else | 67 | else |
| 68 | np = of_get_cpu_node(cpu, 0); | 68 | np = of_get_cpu_node(cpu, NULL); |
| 69 | 69 | ||
| 70 | return of_reset_control_get(np, NULL); | 70 | return of_reset_control_get(np, NULL); |
| 71 | } | 71 | } |