* [PATCH] thermal: rockchip: disable thermal->clk in err case
@ 2016-02-15 2:27 Shawn Lin
2016-03-01 11:48 ` Heiko Stübner
2016-03-03 3:34 ` Caesar Wang
0 siblings, 2 replies; 3+ messages in thread
From: Shawn Lin @ 2016-02-15 2:27 UTC (permalink / raw)
To: Zhang Rui, Eduardo Valentin
Cc: Caesar Wang, Heiko Stuebner, linux-pm, linux-rockchip,
linux-kernel, Shawn Lin
Disable thermal->clk when enabling pclk fails in
resume routine.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
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 9787e8a..b54f6db 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -656,8 +656,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);
--
2.3.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] thermal: rockchip: disable thermal->clk in err case
2016-02-15 2:27 [PATCH] thermal: rockchip: disable thermal->clk in err case Shawn Lin
@ 2016-03-01 11:48 ` Heiko Stübner
2016-03-03 3:34 ` Caesar Wang
1 sibling, 0 replies; 3+ messages in thread
From: Heiko Stübner @ 2016-03-01 11:48 UTC (permalink / raw)
To: Shawn Lin
Cc: Zhang Rui, Eduardo Valentin, Caesar Wang, linux-pm,
linux-rockchip, linux-kernel
Am Montag, 15. Februar 2016, 10:27:22 schrieb Shawn Lin:
> Disable thermal->clk when enabling pclk fails in
> resume routine.
>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> ---
>
> 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 9787e8a..b54f6db 100644
> --- a/drivers/thermal/rockchip_thermal.c
> +++ b/drivers/thermal/rockchip_thermal.c
> @@ -656,8 +656,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);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] thermal: rockchip: disable thermal->clk in err case
2016-02-15 2:27 [PATCH] thermal: rockchip: disable thermal->clk in err case Shawn Lin
2016-03-01 11:48 ` Heiko Stübner
@ 2016-03-03 3:34 ` Caesar Wang
1 sibling, 0 replies; 3+ messages in thread
From: Caesar Wang @ 2016-03-03 3:34 UTC (permalink / raw)
To: Shawn Lin
Cc: Zhang Rui, Eduardo Valentin, Heiko Stuebner, linux-pm,
linux-kernel, linux-rockchip, Caesar Wang
Hi ,
Sorry for the missing it.
在 2016年02月15日 10:27, Shawn Lin 写道:
> Disable thermal->clk when enabling pclk fails in
> resume routine.
>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Reviewed-by: Caesar Wang <wxt@rock-chips.com>
> ---
>
> 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 9787e8a..b54f6db 100644
> --- a/drivers/thermal/rockchip_thermal.c
> +++ b/drivers/thermal/rockchip_thermal.c
> @@ -656,8 +656,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);
>
--
Thanks,
Caesar
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-03 3:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-15 2:27 [PATCH] thermal: rockchip: disable thermal->clk in err case Shawn Lin
2016-03-01 11:48 ` Heiko Stübner
2016-03-03 3:34 ` Caesar Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).