---

yaml --- r: 294352 b: refs/heads/master c: b622f1b h: refs/heads/master v: v3
git-mirror · Mar 21, 2012 · d873e89 · d873e89
1 parent 42aae3e
commit d873e89
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: cfc4bcfe84e14b858dc6a1ab6bbf34d69edabc27
+refs/heads/master: b622f1b538f91ab320838656fc0b31d11a67c5fc
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
@@ -1435,7 +1435,7 @@ static void pxafb_enable_controller(struct pxafb_info *fbi)
 	pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3);
 
 	/* enable LCD controller clock */
-	clk_enable(fbi->clk);
+	clk_prepare_enable(fbi->clk);
 
 	if (fbi->lccr0 & LCCR0_LCDT)
 		return;
@@ -1475,7 +1475,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
 	wait_for_completion_timeout(&fbi->disable_done, 200 * HZ / 1000);
 
 	/* disable LCD controller clock */
-	clk_disable(fbi->clk);
+	clk_disable_unprepare(fbi->clk);
 }
 
 /*