From patchwork Thu Dec 6 07:42:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [1/2] mtd: mxc_nand: fix unbalanced clk_disable() in error path Date: Wed, 05 Dec 2012 21:42:27 -0000 From: =?utf-8?q?Lothar_Wa=C3=9Fmann?= X-Patchwork-Id: 204168 Message-Id: <1354779748-28869-1-git-send-email-LW@KARO-electronics.de> To: linux-mtd@lists.infradead.org Cc: Artem Bityutskiy , Sascha Hauer , linux-kernel@vger.kernel.org, Shawn Guo , David Woodhouse , =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= If nand_scan_ident() or nand_scan_tail() fails, the NAND chip may have been deselected and the clock already disabled. Thus, check 'clk_act' in the error path to decide whether the clock still needs to be disabled. This fixes a: |WARNING: at drivers/clk/clk.c:472 __clk_disable+0x3c/0x78() Signed-off-by: Lothar Waßmann --- drivers/mtd/nand/mxc_nand.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index d316324..d965809 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -1556,7 +1556,8 @@ static int mxcnd_probe(struct platform_device *pdev) return 0; escan: - clk_disable_unprepare(host->clk); + if (host->clk_act) + clk_disable_unprepare(host->clk); return err; }