From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753255AbcCALsk (ORCPT ); Tue, 1 Mar 2016 06:48:40 -0500 Received: from gloria.sntech.de ([95.129.55.99]:49931 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751984AbcCALsj (ORCPT ); Tue, 1 Mar 2016 06:48:39 -0500 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: Shawn Lin Cc: Zhang Rui , Eduardo Valentin , Caesar Wang , linux-pm@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] thermal: rockchip: disable thermal->clk in err case Date: Tue, 01 Mar 2016 12:48:30 +0100 Message-ID: <1746917.OUUFyOy2vj@diego> User-Agent: KMail/4.14.10 (Linux/4.2.0-1-amd64; KDE/4.14.14; x86_64; ; ) In-Reply-To: <1455503242-19907-1-git-send-email-shawn.lin@rock-chips.com> References: <1455503242-19907-1-git-send-email-shawn.lin@rock-chips.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Heiko Stuebner > --- > > 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);