Browse Source

clk: rockchip: check grf when waiting pll lock

rockchip_clk_get_grf pass on return value from
syscon_regmap_lookup_by_phandle, so we check grf to
make sure whether to do the following things or not.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Shawn Lin 9 years ago
parent
commit
eb4e10c61d
1 changed files with 5 additions and 0 deletions
  1. 5 0
      drivers/clk/rockchip/clk-pll.c

+ 5 - 0
drivers/clk/rockchip/clk-pll.c

@@ -94,6 +94,11 @@ static int rockchip_pll_wait_lock(struct rockchip_clk_pll *pll)
 	unsigned int val;
 	unsigned int val;
 	int delay = 24000000, ret;
 	int delay = 24000000, ret;
 
 
+	if (IS_ERR(grf)) {
+		pr_err("%s: grf regmap not available\n", __func__);
+		return PTR_ERR(grf);
+	}
+
 	while (delay > 0) {
 	while (delay > 0) {
 		ret = regmap_read(grf, pll->lock_offset, &val);
 		ret = regmap_read(grf, pll->lock_offset, &val);
 		if (ret) {
 		if (ret) {