diff options
| -rw-r--r-- | drivers/media/platform/mxc/capture/mxc_v4l2_capture.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c index 11dd48c939cc..9a42daf362b2 100644 --- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c +++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c @@ -2908,8 +2908,13 @@ static int mxc_v4l2_suspend(struct platform_device *pdev, pm_message_t state) if (cam->overlay_on == true) stop_preview(cam); - if ((cam->capture_on == true) && cam->enc_disable) - cam->enc_disable(cam); + if (cam->capture_on == true) { + if (cam->enc_disable_csi) + cam->enc_disable_csi(cam); + + if (cam->enc_disable) + cam->enc_disable(cam); + } if (cam->sensor && cam->open_count) { if (cam->mclk_on[cam->mclk_source]) { @@ -2962,8 +2967,13 @@ static int mxc_v4l2_resume(struct platform_device *pdev) if (cam->overlay_on == true) start_preview(cam); - if (cam->capture_on == true) - mxc_streamon(cam); + if (cam->capture_on == true) { + if (cam->enc_enable) + cam->enc_enable(cam); + + if (cam->enc_enable_csi) + cam->enc_enable_csi(cam); + } up(&cam->busy_lock); |