---

yaml --- r: 347221 b: refs/heads/master c: c10d8ee h: refs/heads/master i: 347219: 99e8116 v: v3
git-mirror · Dec 10, 2012 · d0b0bcb · d0b0bcb
1 parent c16dbd9
commit d0b0bcb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5346c27c5fed6b30aff35e1fcb595625097e646c
+refs/heads/master: c10d8ee3feaf725007e515b5f2972dffaa793f9a
diff --git a/trunk/drivers/mtd/nand/mxc_nand.c b/trunk/drivers/mtd/nand/mxc_nand.c
@@ -1533,7 +1533,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;
 }