[RESEND PATCH 1/8] thermal: rockchip: disable thermal->clk in err case

[Caesar Wang]

From: Shawn Lin 

Disable thermal->clk when enabling pclk fails in
resume routine.

Signed-off-by: Shawn Lin 
Reviewed-by: Heiko Stuebner 
Reviewed-by: Caesar Wang 
Signed-off-by: Caesar Wang 
---

 drivers/thermal/rockchip_thermal.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/rockchip_thermal.c 
b/drivers/thermal/rockchip_thermal.c
index 1dbd862..f4c4bcd 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -979,8 +979,10 @@ static int __maybe_unused rockchip_thermal_resume(struct 
device *dev)
return error;
 
error = clk_enable(thermal->pclk);
-   if (error)
+   if (error) {
+   clk_disable(thermal->clk);
return error;
+   }
 
rockchip_thermal_reset_controller(thermal->reset);
 
-- 
1.9.1

[RESEND PATCH 1/8] thermal: rockchip: disable thermal->clk in err case

[Caesar Wang]

From: Shawn Lin 

Disable thermal->clk when enabling pclk fails in
resume routine.

Signed-off-by: Shawn Lin 
Reviewed-by: Heiko Stuebner 
Reviewed-by: Caesar Wang 
Signed-off-by: Caesar Wang 
---

 drivers/thermal/rockchip_thermal.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/rockchip_thermal.c 
b/drivers/thermal/rockchip_thermal.c
index 1dbd862..f4c4bcd 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -979,8 +979,10 @@ static int __maybe_unused rockchip_thermal_resume(struct 
device *dev)
return error;
 
error = clk_enable(thermal->pclk);
-   if (error)
+   if (error) {
+   clk_disable(thermal->clk);
return error;
+   }
 
rockchip_thermal_reset_controller(thermal->reset);
 
-- 
1.9.1