From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49732C388F9 for ; Sun, 8 Nov 2020 15:41:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DFB34221E9 for ; Sun, 8 Nov 2020 15:41:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604850094; bh=Ro0XFlRfJTxsmdUsm+VsUuYHfoz4ChDTnZqn6A2mBCw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=Tl5yZbZnnXtyaB+6OrTAeKd+v/wveBqELiSjNN9xfGuXXUSUi1Z1u4c1MHRTm0GJj mOkX1Vkxxg9oP06/J5eMQyPu6Hm5F8QszZZdqetoCsfAdOEhIdZg1PVc1sbg8q16Yg 4D337EMl/2O53e0j1xj3qcSMDAu8GBpSHB/eGz1U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727844AbgKHPle (ORCPT ); Sun, 8 Nov 2020 10:41:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:52582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726814AbgKHPle (ORCPT ); Sun, 8 Nov 2020 10:41:34 -0500 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1EBEC206ED; Sun, 8 Nov 2020 15:41:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604850093; bh=Ro0XFlRfJTxsmdUsm+VsUuYHfoz4ChDTnZqn6A2mBCw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=a1b7mIEmiDKom1i3FfZH1EVwV11OCSXeE0soCh2G3P8PGWCvIHVZMi0yfXvajA/Mg kuCeEFjysVB/RasYm7Lw6qC+ERq59s2Nfl1fZM6Hi+hsk1NlSM/uNXt4QChYPn6b4D IRjdwhtdGkADNnqSjA6f2Rt8wdsCERmh9riR07rY= Date: Sun, 8 Nov 2020 15:41:28 +0000 From: Jonathan Cameron To: Qinglang Miao Cc: Robin Murphy , Lars-Peter Clausen , Peter Meerwald-Stadler , Heiko Stuebner , , , , Subject: Re: [PATCH v2] iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume Message-ID: <20201108154128.57f4162f@archlinux> In-Reply-To: <20201103120743.110662-1-miaoqinglang@huawei.com> References: <20201103120743.110662-1-miaoqinglang@huawei.com> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Tue, 3 Nov 2020 20:07:43 +0800 Qinglang Miao wrote: > Fix the missing clk_disable_unprepare() of info->pclk > before return from rockchip_saradc_resume in the error > handling case when fails to prepare and enable info->clk. > > Fixes: 44d6f2ef94f9 ("iio: adc: add driver for Rockchip saradc") > Suggested-by:Robin Murphy > Signed-off-by: Qinglang Miao Looks good to me. I'll just give it a little longer on the list so Heiko and others have a chance to sanity check it. Thanks, Jonathan > --- > v2: remove useless braces because early return is pointless. > > drivers/iio/adc/rockchip_saradc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c > index 1f3d7d639..12584f163 100644 > --- a/drivers/iio/adc/rockchip_saradc.c > +++ b/drivers/iio/adc/rockchip_saradc.c > @@ -462,7 +462,7 @@ static int rockchip_saradc_resume(struct device *dev) > > ret = clk_prepare_enable(info->clk); > if (ret) > - return ret; > + clk_disable_unprepare(info->pclk); > > return ret; > }