---

yaml --- r: 330875 b: refs/heads/master c: 52cf3e4 h: refs/heads/master i: 330873: 147b680 330871: 5ef659a v: v3
git-mirror · Aug 15, 2012 · 1cf281e · 1cf281e
1 parent 83c9888
commit 1cf281e
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: dc5d598219ed5e914ec139d8c82d0866cdb7b8ce
+refs/heads/master: 52cf3e42951e8316af9ff0db002f169e3efb63e9
diff --git a/trunk/drivers/media/platform/mx1_camera.c b/trunk/drivers/media/platform/mx1_camera.c
@@ -403,7 +403,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev)
 
 	dev_dbg(pcdev->icd->parent, "Activate device\n");
 
-	clk_enable(pcdev->clk);
+	clk_prepare_enable(pcdev->clk);
 
 	/* enable CSI before doing anything else */
 	__raw_writel(csicr1, pcdev->base + CSICR1);
@@ -422,7 +422,7 @@ static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev)
 	/* Disable all CSI interface */
 	__raw_writel(0x00, pcdev->base + CSICR1);
 
-	clk_disable(pcdev->clk);
+	clk_disable_unprepare(pcdev->clk);
 }
 
 /*