openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: mach-hisi: Hisilicon SoC updates for 4.12 

- Fix the error return code in hip04_smp_init
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJY6IFTAAoJEAvIV27ZiWZcR78P/3e9yd9dcZXzjfYD9UMzxW67
 h7CloL9U1c3xC8vvPvU8tbCdiZQAvhU6JWmfJlBap2gVUDcPLmFgl8zDOnUG8Ar+
 Qx4jruv7Kd5m0HrugZIdHxLeuK4DrdRy/gz6LG49V0J8eoMJPtcJAo/8i4gso12C
 mr98lYs8FUHoETYEgeSw2oU73I7oTJhLymvTSSAs5bCsYdST6Y9+KpF/tISi8Yqm
 ezSpUjp7b089QZD0K6zsET0EgNYWF2vejOYi1jKIrejF7K4pJWPKp7xduqCDCYjQ
 vV3n/JLDZyDSXD0JKgBEuYHYyiII3O8us2m5yPx6UWpCTXzH4z28nMy6hlY9uBJ3
 2zN9SOJGJutmXOBPoewPzy20wS9bFwTIsRTGPrTZia3SaHFoe/S4gaeWcnVWQzs+
 op9FpM7iLxpHO/ZWUqKwJoFUFeHJhzo/WUb3GRcVadHhTD3/lrONIvyGKsuBWIUq
 682IGb9S7il1RIB48383tFzgW9HUNeHXta9dnOsV3/EmlDI/2szDXd34Ncz9m2oP
 MRlDccc90I79g2nGKE0+1Axu5h5bkdsOKhkcc2PYCtq0Q290wnhaTd0Q23ie+hQX
 dZN9oSGffXThbUoJaVceHPA7t+HGIek21FYHyIYLFc+jcMgRIEXmgMft05b56kWX
 gvwHlW9jUukK7lvG39IV
 =HwMR
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2017-04-19 07:02:50 -07:00
parent ab57c2b494 f147140c7f
commit d7718c147a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-hisi/platmcpm.c
View File

@ -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;