From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolin Chen Subject: Re: [PATCH v2] ASoC: fsl: fsl_asrc: Check for clk_prepare_enable() error Date: Sat, 20 Jun 2015 14:04:37 -0700 Message-ID: <20150620210436.GA9052@Asurada> References: <1434834013-23088-1-git-send-email-festevam@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by alsa0.perex.cz (Postfix) with ESMTP id 3FB6426051B for ; Sat, 20 Jun 2015 23:04:51 +0200 (CEST) Received: by pdjm12 with SMTP id m12so112647980pdj.3 for ; Sat, 20 Jun 2015 14:04:50 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1434834013-23088-1-git-send-email-festevam@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Fabio Estevam Cc: Fabio Estevam , alsa-devel@alsa-project.org, broonie@kernel.org List-Id: alsa-devel@alsa-project.org On Sat, Jun 20, 2015 at 06:00:13PM -0300, Fabio Estevam wrote: > From: Fabio Estevam > > clk_prepare_enable() may fail, so we should better check its return value > and propagate it in the case of error. > > Signed-off-by: Fabio Estevam Acked-by: Nicolin Chen Thank you Nicolin > --- > Changes since v1: > - Also handle the error for asrck_clk[i] as suggested > by Nicolin > > sound/soc/fsl/fsl_asrc.c | 25 ++++++++++++++++++++----- > 1 file changed, 20 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c > index c068494..9f087d4 100644 > --- a/sound/soc/fsl/fsl_asrc.c > +++ b/sound/soc/fsl/fsl_asrc.c > @@ -931,14 +931,29 @@ static int fsl_asrc_probe(struct platform_device *pdev) > static int fsl_asrc_runtime_resume(struct device *dev) > { > struct fsl_asrc *asrc_priv = dev_get_drvdata(dev); > - int i; > + int i, ret; > > - clk_prepare_enable(asrc_priv->mem_clk); > - clk_prepare_enable(asrc_priv->ipg_clk); > - for (i = 0; i < ASRC_CLK_MAX_NUM; i++) > - clk_prepare_enable(asrc_priv->asrck_clk[i]); > + ret = clk_prepare_enable(asrc_priv->mem_clk); > + if (ret) > + return ret; > + ret = clk_prepare_enable(asrc_priv->ipg_clk); > + if (ret) > + goto disable_mem_clk; > + for (i = 0; i < ASRC_CLK_MAX_NUM; i++) { > + ret = clk_prepare_enable(asrc_priv->asrck_clk[i]); > + if (ret) > + goto disable_asrck_clk; > + } > > return 0; > + > +disable_asrck_clk: > + for (i--; i >= 0; i--) > + clk_disable_unprepare(asrc_priv->asrck_clk[i]); > + clk_disable_unprepare(asrc_priv->ipg_clk); > +disable_mem_clk: > + clk_disable_unprepare(asrc_priv->mem_clk); > + return ret; > } > > static int fsl_asrc_runtime_suspend(struct device *dev) > -- > 1.9.1 >