summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2013-06-25 10:55:48 -0700
committerTroy Kisky <troy.kisky@boundarydevices.com>2013-06-27 16:19:10 -0700
commit73ebaa6b022af4c03fba18f044c79b9125ef0881 (patch)
tree0d83aae0a4fb498106dd237acc04e1912b118446
parente6e1b5aeccf7c88a725440095f83dfa9459dbfca (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>
-rw-r--r--drivers/media/video/mxc/capture/mxc_v4l2_capture.c1
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 6c83be2f9af7..dc16ae2d1738 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,