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 4f907f650dfce00e2a7815cf18bcc59338ad35e9..53ef4e70e3b5dfa36968ab97f81a1b95173d230c 100644 (file)
--- 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);
        }
 
        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
 
        /*
         * Configure power up and down transition delays for CORE