Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753373AbdIRKOW (ORCPT ); Mon, 18 Sep 2017 06:14:22 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:60573 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752587AbdIRKOV (ORCPT ); Mon, 18 Sep 2017 06:14:21 -0400 Date: Mon, 18 Sep 2017 12:14:09 +0200 From: Boris Brezillon To: Alexey Khoroshilov Cc: Brian Norris , Neil Armstrong , linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-oxnas@lists.tuxfamily.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: Re: [PATCH] mtd: oxnas_nand: Fix error handling in oxnas_nand_probe() Message-ID: <20170918121409.03e4b978@bbrezillon> In-Reply-To: <1504908038-26285-1-git-send-email-khoroshilov@ispras.ru> References: <1504908038-26285-1-git-send-email-khoroshilov@ispras.ru> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2072 Lines: 69 Hi Alexey, On Sat, 9 Sep 2017 01:00:38 +0300 Alexey Khoroshilov wrote: > oxnas_nand_probe() does not disable clock on error paths. > The patch adds disabling using devm interface. > > Found by Linux Driver Verification project (linuxtesting.org). > > Signed-off-by: Alexey Khoroshilov > --- > drivers/mtd/nand/oxnas_nand.c | 22 +++++++++++++++------- > 1 file changed, 15 insertions(+), 7 deletions(-) > > diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c > index 1b207aac840c..8abc69a285dd 100644 > --- a/drivers/mtd/nand/oxnas_nand.c > +++ b/drivers/mtd/nand/oxnas_nand.c > @@ -103,16 +103,26 @@ static int oxnas_nand_probe(struct platform_device *pdev) > if (IS_ERR(oxnas->io_base)) > return PTR_ERR(oxnas->io_base); > > - oxnas->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(oxnas->clk)) > - oxnas->clk = NULL; > - > /* Only a single chip node is supported */ > count = of_get_child_count(np); > if (count > 1) > return -EINVAL; > > - clk_prepare_enable(oxnas->clk); > + oxnas->clk = devm_clk_get(&pdev->dev, NULL); > + if (IS_ERR(oxnas->clk)) { > + oxnas->clk = NULL; > + } else { > + err = clk_prepare_enable(oxnas->clk); > + if (err) > + return err; > + > + err = devm_add_action_or_reset(&pdev->dev, > + (void(*)(void *))clk_disable_unprepare, > + oxnas->clk); > + if (err) > + return err; > + } > + Looks like something that should be made available at the CCF level either with a devm_clk_get_prepare_enable() or with a devm_clk_prepare_enable() helper. Would you care proposing this change to the CCF ML? In the meantime can you provide a simpler fix that just adds the missing clk_disable_unprepare() call in the error path? > device_reset_optional(&pdev->dev); > > for_each_child_of_node(np, nand_np) { > @@ -167,8 +177,6 @@ static int oxnas_nand_remove(struct platform_device *pdev) > if (oxnas->chips[0]) > nand_release(nand_to_mtd(oxnas->chips[0])); > > - clk_disable_unprepare(oxnas->clk); > - > return 0; > } >