diff options
| author | Shawn Lin <shawn.lin@rock-chips.com> | 2016-04-18 11:35:53 +0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@rock-chips.com> | 2016-04-18 17:20:04 +0800 |
| commit | e90650e85bcfb1682d55e8f77adf786dd874f37b (patch) | |
| tree | 9d1b685aaff12e5bbee5a62388ca00a021eb88d4 /drivers/thermal/rockchip_thermal.c | |
| parent | 268399dd6510997f0cce07f20ab9fbd5dcd89ee9 (diff) | |
FROMLIST: thermal: rockchip: disable thermal->clk in err case
Disable thermal->clk when enabling pclk fails in
resume routine.
Change-Id: I7d8780be04891bf4cddf1ba970eae2a2f14ec7ac
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(am from https://patchwork.kernel.org/patch/8867151/)
Diffstat (limited to 'drivers/thermal/rockchip_thermal.c')
| -rw-r--r-- | drivers/thermal/rockchip_thermal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index dcd36db4e104..39e2eec57fff 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -1154,8 +1154,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); |