From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Turquette Date: Wed, 28 May 2014 21:47:39 +0000 Subject: Re: [PATCH] CLK: TI: DRA7: return error code in failure case Message-Id: <20140528214739.10062.75330@quantum> List-Id: References: <1400473875-22228-1-git-send-email-Julia.Lawall@lip6.fr> <1400473875-22228-4-git-send-email-Julia.Lawall@lip6.fr> <20140519074155.GO15585@mwanda> <5379BC0C.3070401@ti.com> <5379F7AE.2040806@ti.com> In-Reply-To: <5379F7AE.2040806@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Tero Kristo , Julia Lawall Cc: Dan Carpenter , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, J Keerthy Quoting Tero Kristo (2014-05-19 05:23:10) > On 05/19/2014 02:25 PM, Julia Lawall wrote: > > From: Julia Lawall > > > > Add a returned error code in the MAX_APLL_WAIT_TRIES case. Remove the > > updating of the return variable r to 0 if MAX_APLL_WAIT_TRIES is not yet > > reached, because r is already 0 at this point. > > > > Signed-off-by: Julia Lawall > > Acked-by: Tero Kristo > > Mike, do you want to queue this as a fix or shall I add this to be > queued for 3.16? It's not a visible regression, so let's go with 3.16. Regards, Mike > > -Tero > > > > > --- > > diff --git a/drivers/clk/ti/apll.c b/drivers/clk/ti/apll.c > > index b986f61..efc71a0 100644 > > --- a/drivers/clk/ti/apll.c > > +++ b/drivers/clk/ti/apll.c > > @@ -77,13 +77,11 @@ static int dra7_apll_enable(struct clk_hw *hw) > > if (i = MAX_APLL_WAIT_TRIES) { > > pr_warn("clock: %s failed transition to '%s'\n", > > clk_name, (state) ? "locked" : "bypassed"); > > - } else { > > + r = -EBUSY; > > + } else > > pr_debug("clock: %s transition to '%s' in %d loops\n", > > clk_name, (state) ? "locked" : "bypassed", i); > > > > - r = 0; > > - } > > - > > return r; > > } > > >