diff options
| author |   Olof Johansson <olof@lixom.net> | 2017-04-19 07:02:50 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 07:02:50 -0700 |
| commit | d7718c147a89783ec3bf1735f724ca32174393dd (patch) | |
| tree | 9e4bcf1aafcb470c9d28430baeb1a89e48c49968 | |
| parent | Merge tag 'imx-soc-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc (diff) | |
| parent | ARM: hisi: fix error return code in hip04_smp_init() (diff) | |
| download | wireguard-linux-d7718c147a89783ec3bf1735f724ca32174393dd.tar.xz wireguard-linux-d7718c147a89783ec3bf1735f724ca32174393dd.zip | |
Merge tag 'hisi-armv7-soc-for-4.12' of git://github.com/hisilicon/linux-hisi into next/soc
ARM: mach-hisi: Hisilicon SoC updates for 4.12
- Fix the error return code in hip04_smp_init
* tag 'hisi-armv7-soc-for-4.12' of git://github.com/hisilicon/linux-hisi:
ARM: hisi: fix error return code in hip04_smp_init()
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-hisi/platmcpm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-hisi/platmcpm.c b/arch/arm/mach-hisi/platmcpm.c index a6c117622d67..f66815c3dd07 100644 --- a/arch/arm/mach-hisi/platmcpm.c +++ b/arch/arm/mach-hisi/platmcpm.c @@ -279,6 +279,8 @@ static int __init hip04_smp_init(void) &hip04_boot_method[0], 4); if (ret) goto err; + + ret = -ENODEV; np_sctl = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl"); if (!np_sctl) goto err; |