aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Lin <shawn.lin@rock-chips.com>2016-03-12 23:13:22 -0500
committerHeiko Stuebner <heiko@sntech.de>2016-03-27 07:03:35 -0400
commit1d003eb0805ac5b549e76202a1e95da33f62cb9a (patch)
tree372bc7310ebd63735e067e43e06e02c3aeca46d9
parentff1ae209617cb31a5297bd103709d6b9e2db77d2 (diff)
clk: rockchip: release io resource when failing to init clk
We should call iounmap to relase reg_base since it's not going to be used any more if failing to init clk. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r--drivers/clk/rockchip/clk-rk3036.c1
-rw-r--r--drivers/clk/rockchip/clk-rk3188.c1
-rw-r--r--drivers/clk/rockchip/clk-rk3228.c1
-rw-r--r--drivers/clk/rockchip/clk-rk3288.c1
-rw-r--r--drivers/clk/rockchip/clk-rk3368.c1
5 files changed, 5 insertions, 0 deletions
diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c
index c7c8260e1c66..924f560dcf80 100644
--- a/drivers/clk/rockchip/clk-rk3036.c
+++ b/drivers/clk/rockchip/clk-rk3036.c
@@ -453,6 +453,7 @@ static void __init rk3036_clk_init(struct device_node *np)
453 ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS); 453 ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
454 if (IS_ERR(ctx)) { 454 if (IS_ERR(ctx)) {
455 pr_err("%s: rockchip clk init failed\n", __func__); 455 pr_err("%s: rockchip clk init failed\n", __func__);
456 iounmap(reg_base);
456 return; 457 return;
457 } 458 }
458 459
diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
index 0fcce2295b37..d0e722a0e8cf 100644
--- a/drivers/clk/rockchip/clk-rk3188.c
+++ b/drivers/clk/rockchip/clk-rk3188.c
@@ -773,6 +773,7 @@ static struct rockchip_clk_provider *__init rk3188_common_clk_init(struct device
773 ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS); 773 ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
774 if (IS_ERR(ctx)) { 774 if (IS_ERR(ctx)) {
775 pr_err("%s: rockchip clk init failed\n", __func__); 775 pr_err("%s: rockchip clk init failed\n", __func__);
776 iounmap(reg_base);
776 return ERR_PTR(-ENOMEM); 777 return ERR_PTR(-ENOMEM);
777 } 778 }
778 779
diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c
index c112b2f95224..016bdb0b793a 100644
--- a/drivers/clk/rockchip/clk-rk3228.c
+++ b/drivers/clk/rockchip/clk-rk3228.c
@@ -640,6 +640,7 @@ static void __init rk3228_clk_init(struct device_node *np)
640 ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS); 640 ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
641 if (IS_ERR(ctx)) { 641 if (IS_ERR(ctx)) {
642 pr_err("%s: rockchip clk init failed\n", __func__); 642 pr_err("%s: rockchip clk init failed\n", __func__);
643 iounmap(reg_base);
643 return; 644 return;
644 } 645 }
645 646
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index d1031d1149ce..39af05a589b3 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
@@ -893,6 +893,7 @@ static void __init rk3288_clk_init(struct device_node *np)
893 ctx = rockchip_clk_init(np, rk3288_cru_base, CLK_NR_CLKS); 893 ctx = rockchip_clk_init(np, rk3288_cru_base, CLK_NR_CLKS);
894 if (IS_ERR(ctx)) { 894 if (IS_ERR(ctx)) {
895 pr_err("%s: rockchip clk init failed\n", __func__); 895 pr_err("%s: rockchip clk init failed\n", __func__);
896 iounmap(rk3288_cru_base);
896 return; 897 return;
897 } 898 }
898 899
diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c
index 3121414cfd63..6cb474c593e7 100644
--- a/drivers/clk/rockchip/clk-rk3368.c
+++ b/drivers/clk/rockchip/clk-rk3368.c
@@ -875,6 +875,7 @@ static void __init rk3368_clk_init(struct device_node *np)
875 ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS); 875 ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
876 if (IS_ERR(ctx)) { 876 if (IS_ERR(ctx)) {
877 pr_err("%s: rockchip clk init failed\n", __func__); 877 pr_err("%s: rockchip clk init failed\n", __func__);
878 iounmap(reg_base);
878 return; 879 return;
879 } 880 }
880 881