summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-08-13 23:43:19 -0300
committerHeiko Stuebner <heiko@sntech.de>2015-08-24 12:39:14 +0200
commit2a03c025fdea25a491c359b31d8a8c8d452b06d0 (patch)
treefc34d4e13bcd331e5a8801e60ef5678c951960d0
parent9bb91ae970dd004393a3d7d09bdcc30dfe2f8693 (diff)
downloadop-kernel-dev-2a03c025fdea25a491c359b31d8a8c8d452b06d0.zip
op-kernel-dev-2a03c025fdea25a491c359b31d8a8c8d452b06d0.tar.gz
ARM: rockchip: pm: Fix PTR_ERR() argument
PTR_ERR should access the value just tested by IS_ERR. The semantic patch that makes this change is available in scripts/coccinelle/tests/odd_ptr_err.cocci. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r--arch/arm/mach-rockchip/pm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c
index 156cd23..bee8c80 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,
OpenPOWER on IntegriCloud