Browse Source

media mx3 camera: prepare clk before enabling it

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer 13 years ago
parent
commit
fdf7748b9f
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/media/video/mx3_camera.c

+ 2 - 2
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;