From: Shawn Lin <shawn.lin@rock-chips.com>
Date: Mon, 15 Feb 2016 03:33:57 +0000 (+0800)
Subject: UPSTREAM: soc: rockchip: power-domain: check the existing of regmap
X-Git-Tag: firefly_0821_release~2764
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aa7c7be40edeab52037c6c1fdbc6e1f3e8c90a22;p=firefly-linux-kernel-4.4.55.git

UPSTREAM: 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.

Change-Id: I8b6f2a62d383c5cae5b69e030a8a8e2ad9cc18c1
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from git.kernel.org mmind/linux-rockchip.git v4.7-armsoc/drivers
 commit 4506697d9f8537a8d33e9e002f8efceb32d10757)
---

diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
index 4f907f650dfc..53ef4e70e3b5 100644
--- a/drivers/soc/rockchip/pm_domains.c
+++ b/drivers/soc/rockchip/pm_domains.c
@@ -476,6 +476,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