diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/mx3_camera.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 02d54a057b60..f13643d31353 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c | |||
@@ -511,7 +511,7 @@ static void mx3_camera_activate(struct mx3_camera_dev *mx3_cam, | |||
511 | /* ipu_csi_init_interface() */ | 511 | /* ipu_csi_init_interface() */ |
512 | csi_reg_write(mx3_cam, conf, CSI_SENS_CONF); | 512 | csi_reg_write(mx3_cam, conf, CSI_SENS_CONF); |
513 | 513 | ||
514 | clk_enable(mx3_cam->clk); | 514 | clk_prepare_enable(mx3_cam->clk); |
515 | rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk); | 515 | rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk); |
516 | dev_dbg(icd->parent, "Set SENS_CONF to %x, rate %ld\n", conf, rate); | 516 | dev_dbg(icd->parent, "Set SENS_CONF to %x, rate %ld\n", conf, rate); |
517 | if (rate) | 517 | if (rate) |
@@ -552,7 +552,7 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd) | |||
552 | *ichan = NULL; | 552 | *ichan = NULL; |
553 | } | 553 | } |
554 | 554 | ||
555 | clk_disable(mx3_cam->clk); | 555 | clk_disable_unprepare(mx3_cam->clk); |
556 | 556 | ||
557 | mx3_cam->icd = NULL; | 557 | mx3_cam->icd = NULL; |
558 | 558 | ||