aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <[email protected]>2017-04-19 07:02:50 -0700
committerOlof Johansson <[email protected]>2017-04-19 07:02:50 -0700
commitd7718c147a89783ec3bf1735f724ca32174393dd (patch)
tree9e4bcf1aafcb470c9d28430baeb1a89e48c49968
parentab57c2b4948eb02108b26b9c3410a811bae5e352 (diff)
parentf147140c7f0350d363c10aeb51b78b65b2425266 (diff)
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 <[email protected]>
-rw-r--r--arch/arm/mach-hisi/platmcpm.c2
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;