summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlex Gonzalez <alex.gonzalez@digi.com>2011-10-21 14:09:45 +0200
committerAlex Gonzalez <alex.gonzalez@digi.com>2011-10-24 14:34:28 +0200
commit72c7533a8a90f92a9335b4d776836c9ead7d900b (patch)
treec62941fc24025fb2178d22365b966823e2a2528d /drivers
parentd3a98b142679038b9d0fd5340f9739948a959123 (diff)
MXC V4L2 capture: Reinitialize CSI on resume. (#40007)
The CSI registers lose their configuration on suspend. Make sure they are reinitialized on resume.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/mxc/capture/mxc_v4l2_capture.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
index 002b6021446e..e5ad5493565a 100644
--- a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
+++ b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
@@ -2719,6 +2719,7 @@ static int mxc_v4l2_suspend(struct platform_device *pdev, pm_message_t state)
static int mxc_v4l2_resume(struct platform_device *pdev)
{
cam_data *cam = platform_get_drvdata(pdev);
+ int err=0;
pr_debug("In MVC:mxc_v4l2_resume\n");
@@ -2735,6 +2736,10 @@ static int mxc_v4l2_resume(struct platform_device *pdev)
if (cam->sensor)
vidioc_int_s_power(cam->sensor, 1);
+ err = mxc_v4l2_init_csi(cam);
+ if(err)
+ pr_err("Error initializing CSI\n");
+
if (cam->overlay_on == true)
start_preview(cam);