public inbox for linux-mtd@lists.infradead.org
 help / color / mirror / Atom feed
From: "Lothar Waßmann" <LW@KARO-electronics.de>
To: linux-mtd@lists.infradead.org
Cc: "Artem Bityutskiy" <artem.bityutskiy@linux.intel.com>,
	"Sascha Hauer" <s.hauer@pengutronix.de>,
	linux-kernel@vger.kernel.org, "Shawn Guo" <shawn.guo@linaro.org>,
	"David Woodhouse" <dwmw2@infradead.org>,
	"Lothar Waßmann" <LW@KARO-electronics.de>
Subject: [PATCH 1/2] mtd: mxc_nand: fix unbalanced clk_disable() in error path
Date: Thu,  6 Dec 2012 08:42:27 +0100	[thread overview]
Message-ID: <1354779748-28869-1-git-send-email-LW@KARO-electronics.de> (raw)

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 <LW@KARO-electronics.de>
---
 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;
 }
-- 
1.7.2.5

             reply	other threads:[~2012-12-06  7:42 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-06  7:42 Lothar Waßmann [this message]
2012-12-06  7:42 ` [PATCH 2/2] mtd: mxc_nand: reorder part_probes to let cmdline override other sources Lothar Waßmann
2012-12-10 14:46   ` Artem Bityutskiy
2012-12-06  7:45 ` [PATCH 1/2] mtd: mxc_nand: fix unbalanced clk_disable() in error path Sascha Hauer
2012-12-10 14:46 ` Artem Bityutskiy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1354779748-28869-1-git-send-email-LW@KARO-electronics.de \
    --to=lw@karo-electronics.de \
    --cc=artem.bityutskiy@linux.intel.com \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawn.guo@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox