---

yaml --- r: 332632 b: refs/heads/master c: 3d05969 h: refs/heads/master v: v3
git-mirror · Jul 6, 2012 · 4dc488b · 4dc488b
1 parent 39ec367
commit 4dc488b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1696e6bc2ae83734e64e206ac99766ea19e9a14e
+refs/heads/master: 3d059693f6e0489066a98f455601137fa003df77
diff --git a/trunk/drivers/mtd/nand/mxc_nand.c b/trunk/drivers/mtd/nand/mxc_nand.c
@@ -784,15 +784,15 @@ static void mxc_nand_select_chip_v2(struct mtd_info *mtd, int chip)
 	if (chip == -1) {
 		/* Disable the NFC clock */
 		if (host->clk_act) {
-			clk_disable(host->clk);
+			clk_disable_unprepare(host->clk);
 			host->clk_act = 0;
 		}
 		return;
 	}
 
 	if (!host->clk_act) {
 		/* Enable the NFC clock */
-		clk_enable(host->clk);
+		clk_prepare_enable(host->clk);
 		host->clk_act = 1;
 	}