diff options
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | 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 84f363571c2..970ce6bd06a 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) | |||
888 | DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n"); | 888 | DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n"); |
889 | 889 | ||
890 | ret = mtd->suspend(mtd); | 890 | ret = mtd->suspend(mtd); |
891 | /* Disable the NFC clock */ | 891 | |
892 | clk_disable(host->clk); | 892 | /* |
893 | * nand_suspend locks the device for exclusive access, so | ||
894 | * the clock must already be off. | ||
895 | */ | ||
896 | BUG_ON(!ret && host->clk_act); | ||
893 | 897 | ||
894 | return ret; | 898 | return ret; |
895 | } | 899 | } |
@@ -903,8 +907,6 @@ static int mxcnd_resume(struct platform_device *pdev) | |||
903 | 907 | ||
904 | DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n"); | 908 | DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n"); |
905 | 909 | ||
906 | /* Enable the NFC clock */ | ||
907 | clk_enable(host->clk); | ||
908 | mtd->resume(mtd); | 910 | mtd->resume(mtd); |
909 | 911 | ||
910 | return ret; | 912 | return ret; |