summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorShawn Lin <shawn.lin@rock-chips.com>2016-02-15 11:33:57 +0800
committerHeiko Stuebner <heiko@sntech.de>2016-04-12 03:28:08 +0200
commit4506697d9f8537a8d33e9e002f8efceb32d10757 (patch)
treedd6cda03f1a2913b4b4dbd4fd400f946c39c845a /drivers/soc
parentfd8b62cc38b356bcdf20ac8f1a647db7b11240cf (diff)
downloadlinux-stable-4506697d9f8537a8d33e9e002f8efceb32d10757.tar.gz
linux-stable-4506697d9f8537a8d33e9e002f8efceb32d10757.tar.bz2
linux-stable-4506697d9f8537a8d33e9e002f8efceb32d10757.zip
soc: rockchip: power-domain: check the existing of regmap
Check return value of syscon_node_to_regmap for rockchip_pm_domain_probe. If err value is returned, probe procedure should abort. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/rockchip/pm_domains.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
index 2116131528f7..ac729fe42cc9 100644
--- a/drivers/soc/rockchip/pm_domains.c
+++ b/drivers/soc/rockchip/pm_domains.c
@@ -475,6 +475,10 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev)
}
pmu->regmap = syscon_node_to_regmap(parent->of_node);
+ if (IS_ERR(pmu->regmap)) {
+ dev_err(dev, "no regmap available\n");
+ return PTR_ERR(pmu->regmap);
+ }
/*
* Configure power up and down transition delays for CORE