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>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c
index 156cd23dfba5..bee8c8051929 100644
--- a/arch/arm/mach-rockchip/pm.c
+++ b/arch/arm/mach-rockchip/pm.c
@@ -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,