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>

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;