aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-04-03 06:35:16 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-25 11:03:42 -0400
commitfdf7748b9f8d392a086560616bf112f0ba0c1f71 (patch)
tree2ada5c35d81471d506da611e4132136ebe4d8d94 /drivers/media
parent4e7b6c9a6b4700cf121a0d5924f193db83cbd008 (diff)
media mx3 camera: prepare clk before enabling it
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/mx3_camera.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index 93c35ef5f0ad..e2e33df868de 100644
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -508,7 +508,7 @@ static void mx3_camera_activate(struct mx3_camera_dev *mx3_cam,
508 /* ipu_csi_init_interface() */ 508 /* ipu_csi_init_interface() */
509 csi_reg_write(mx3_cam, conf, CSI_SENS_CONF); 509 csi_reg_write(mx3_cam, conf, CSI_SENS_CONF);
510 510
511 clk_enable(mx3_cam->clk); 511 clk_prepare_enable(mx3_cam->clk);
512 rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk); 512 rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk);
513 dev_dbg(icd->parent, "Set SENS_CONF to %x, rate %ld\n", conf, rate); 513 dev_dbg(icd->parent, "Set SENS_CONF to %x, rate %ld\n", conf, rate);
514 if (rate) 514 if (rate)
@@ -549,7 +549,7 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd)
549 *ichan = NULL; 549 *ichan = NULL;
550 } 550 }
551 551
552 clk_disable(mx3_cam->clk); 552 clk_disable_unprepare(mx3_cam->clk);
553 553
554 mx3_cam->icd = NULL; 554 mx3_cam->icd = NULL;
555 555