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....@rock-chips.com>

Reviewed-by: Heiko Stuebner <he...@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);

Reply via email to