Skip to content

Commit

Permalink
mtd: mxc-nand: don't disable clock in mxcnd-suspend
Browse files Browse the repository at this point in the history
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@pengutronix.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
Uwe Kleine-König authored and David Woodhouse committed Feb 25, 2010
1 parent b840bc1 commit 9c14b15
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/mtd/nand/mxc_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down

0 comments on commit 9c14b15

Please sign in to comment.