diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2013-06-25 10:55:48 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-09-03 14:12:29 -0700 |
| commit | 73d3e11a31ee2a14cb7a80c247b3ade3aca7db77 (patch) | |
| tree | a495b9786d4c5b614770996455fe91d67be92511 /drivers | |
| parent | e0a386beeaa158b1c0325d75bdc3ce7e75627791 (diff) | |
mxc_v4l2_capture: fix power off when closing device
There is already a call to power_off_camera() in mxc_v4l_close(),
so delete the call to vidioc_int_s_power(). This fixes a situation
where the power is off but the driver thinks it is on still.
This should be squashed with and separated from
commit: add ar1021 touchscreen
Signed-off-by: Philip Craig <phil@blackmoth.com.au>
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/mxc/capture/mxc_v4l2_capture.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c index 8f0e4123f1d3..f01b6fe41b61 100644 --- a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c @@ -1786,7 +1786,6 @@ static int mxc_v4l_close(struct file *file) } if (--cam->open_count == 0) { - vidioc_int_s_power(cam->sensor, 0); if (cam->mclk_on[cam->mclk_source]) { ipu_csi_enable_mclk_if(cam->ipu, CSI_MCLK_I2C, cam->mclk_source, |