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

Fix for wrong error-codes in rk3288 suspend code. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJV3BkkAAoJEPOmecmc0R2B0T8H/23dDYmb1aKxpujzQqqZGNgx
 Aj3j50haQ23rst2UqJ9u3z+w1uhCEaLnDeXSC54VsyhhGOwczqmqA4XtH9cCdsIy
 R1AGfyXooOtKvu/IC+AGEIzVKL6bYc4BJ3jgj8tbW9RxdkyoSIYTUbUgYE9Scl3q
 3XIiCIAYY3C1zfh+4IuoxKY1hRokh9V068OEfad2/2HbIzYZdSBliO8EFw6St2DX
 cjlCCPyH8ipgA0G2IS2IA4yFobNac6xnqVwZb9/YVnYd9uxdVBBJGpWB9Lr/vOrz
 LaGILxWqPYLrtayJdtWN04TON4o/xAZmaJMFGay7QVWhEj6tVgbwEVw8QfytoOc=
 =uZaq
 -----END PGP SIGNATURE-----

Merge tag 'v4.3-rockchip32-soc3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

Fix for wrong error-codes in rk3288 suspend code.

* tag 'v4.3-rockchip32-soc3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: pm: Fix PTR_ERR() argument

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-08-25 10:16:48 -07:00
parent 6be4b0da4e 2a03c025fd
commit 1ec6f70170
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-rockchip/pm.c
View File

@ -246,14 +246,14 @@ static int rk3288_suspend_init(struct device_node *np)
"rockchip,rk3288-sgrf");
if (IS_ERR(sgrf_regmap)) {
pr_err("%s: could not find sgrf regmap\n", __func__);
return PTR_ERR(pmu_regmap);
return PTR_ERR(sgrf_regmap);
}
grf_regmap = syscon_regmap_lookup_by_compatible(
"rockchip,rk3288-grf");
if (IS_ERR(grf_regmap)) {
pr_err("%s: could not find grf regmap\n", __func__);
return PTR_ERR(pmu_regmap);
return PTR_ERR(grf_regmap);
}
sram_np = of_find_compatible_node(NULL, NULL,