Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932104AbcDTOPE (ORCPT ); Wed, 20 Apr 2016 10:15:04 -0400 Received: from mga02.intel.com ([134.134.136.20]:30997 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754217AbcDTOPB (ORCPT ); Wed, 20 Apr 2016 10:15:01 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,509,1455004800"; d="scan'208";a="788650985" Message-ID: <1461161760.6620.306.camel@linux.intel.com> Subject: Re: [PATCH 2/4] i2c: designware-platdrv: fix unbalanced clk enable and prepare From: Andy Shevchenko To: Jarkko Nikula , Jisheng Zhang , mika.westerberg@linux.intel.com, wsa@the-dreams.de Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Date: Wed, 20 Apr 2016 17:16:00 +0300 In-Reply-To: <57177C32.4090000@linux.intel.com> References: <1460638414-5987-1-git-send-email-jszhang@marvell.com> <1460638414-5987-3-git-send-email-jszhang@marvell.com> <57177C32.4090000@linux.intel.com> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.1-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1571 Lines: 45 On Wed, 2016-04-20 at 15:55 +0300, Jarkko Nikula wrote: > On 04/14/2016 03:53 PM, Jisheng Zhang wrote: > > > > If i2c_dw_probe() fail, we should call i2c_dw_plat_prepare_clk() to > > disable and unprepare the clk, otherwise the clk enable and prepare > > is left unbalanced. > > > > Signed-off-by: Jisheng Zhang > > --- > >   drivers/i2c/busses/i2c-designware-platdrv.c | 2 ++ > >   1 file changed, 2 insertions(+) > > > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c > > b/drivers/i2c/busses/i2c-designware-platdrv.c > > index 00f9e99..1488cea 100644 > > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > > @@ -268,6 +268,8 @@ rpm_disable: > >    pm_runtime_put_noidle(&pdev->dev); > >    } > > > > + i2c_dw_plat_prepare_clk(dev, false); > > + > >    return r; > >   } > > > This is a bit unclear to me does devm_clk_get take care of clk > disabling  > in case of probe error or driver removal? > > I see Andy's 1cb715ca4694 ("i2c-designware: move to managed functions  > (devm_*)") removed it but at quick look drivers/clk/clk-devres.c:  > devm_clk_release() calls only clk_put and I don't see disable is done  > down the path. The following is a mistake of the mentioned patch. -       clk_disable_unprepare(dev->clk); I did at the same mistake in dw_dmac driver which had been fixed later in the commit 8be4f523b480 ("dmaengine: dw: fix regression in dw_probe() function"). -- Andy Shevchenko Intel Finland Oy