mtd: mxc-nand: don't disable clock in mxcnd-suspend

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=9c14b153e6af1301f022d34f1f63888f333e3ef5
Commit:     9c14b153e6af1301f022d34f1f63888f333e3ef5
Parent:     b840bc11b5062803c204d8a9625a1a1c5812d6d6
Author:     Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
AuthorDate: Mon Jan 11 17:53:16 2010 +0100
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Thu Feb 25 11:28:35 2010 +0000

    mtd: mxc-nand: don't disable clock in mxcnd-suspend
    
    The clock must already be off after mtd->suspend.  Disabling it again
    results in an negative overflow of the clock usage count.  This didn't
    hurt as mxcnd_resume undid it after wake up.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
    Acked-by: Sascha Hauer <s.hauer at pengutronix.de>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/mxc_nand.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 84f3635..970ce6b 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -888,8 +888,12 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
 	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
 
 	ret = mtd->suspend(mtd);
-	/* Disable the NFC clock */
-	clk_disable(host->clk);
+
+	/*
+	 * nand_suspend locks the device for exclusive access, so
+	 * the clock must already be off.
+	 */
+	BUG_ON(!ret && host->clk_act);
 
 	return ret;
 }
@@ -903,8 +907,6 @@ static int mxcnd_resume(struct platform_device *pdev)
 
 	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
 
-	/* Enable the NFC clock */
-	clk_enable(host->clk);
 	mtd->resume(mtd);
 
 	return ret;