From: Sascha Hauer Date: Tue, 3 Apr 2012 10:35:16 +0000 (+0200) Subject: media mx3 camera: prepare clk before enabling it X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fdf7748b9f8d392a086560616bf112f0ba0c1f71;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git media mx3 camera: prepare clk before enabling it Signed-off-by: Sascha Hauer --- 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, /* ipu_csi_init_interface() */ csi_reg_write(mx3_cam, conf, CSI_SENS_CONF); - clk_enable(mx3_cam->clk); + clk_prepare_enable(mx3_cam->clk); rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk); dev_dbg(icd->parent, "Set SENS_CONF to %x, rate %ld\n", conf, rate); if (rate) @@ -549,7 +549,7 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd) *ichan = NULL; } - clk_disable(mx3_cam->clk); + clk_disable_unprepare(mx3_cam->clk); mx3_cam->icd = NULL;