From a003f5471e71ef48d6eb2584d2188a5a6f697672 Mon Sep 17 00:00:00 2001 From: ddl Date: Sat, 12 Mar 2011 00:23:21 +0800 Subject: [PATCH] camera: fix sensor driver enter power down after sensor_video_probe is error, because sensor enter power down in sensor_deactive --- drivers/media/video/ov2655.c | 2 -- drivers/media/video/ov2659.c | 4 ++-- drivers/media/video/ov5642.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/media/video/ov2655.c b/drivers/media/video/ov2655.c index f9d9eec5183e..64aeab6c78d2 100755 --- a/drivers/media/video/ov2655.c +++ b/drivers/media/video/ov2655.c @@ -2810,11 +2810,9 @@ static int sensor_video_probe(struct soc_camera_device *icd, icd->formats = sensor_colour_formats; icd->num_formats = ARRAY_SIZE(sensor_colour_formats); - sensor_ioctrl(icd, Sensor_PowerDown, 1); return 0; sensor_video_probe_err: - sensor_ioctrl(icd, Sensor_PowerDown, 1); return ret; } static long sensor_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) diff --git a/drivers/media/video/ov2659.c b/drivers/media/video/ov2659.c index 8cf94bb72c6d..ba3ec2a28d91 100755 --- a/drivers/media/video/ov2659.c +++ b/drivers/media/video/ov2659.c @@ -2628,11 +2628,11 @@ static int sensor_video_probe(struct soc_camera_device *icd, icd->formats = sensor_colour_formats; icd->num_formats = ARRAY_SIZE(sensor_colour_formats); - sensor_ioctrl(icd, Sensor_PowerDown, 1); + return 0; sensor_video_probe_err: - sensor_ioctrl(icd, Sensor_PowerDown, 1); + return ret; } diff --git a/drivers/media/video/ov5642.c b/drivers/media/video/ov5642.c index 61b7435b552f..c8f3e304ace0 100755 --- a/drivers/media/video/ov5642.c +++ b/drivers/media/video/ov5642.c @@ -5387,11 +5387,11 @@ static int sensor_video_probe(struct soc_camera_device *icd, icd->formats = sensor_colour_formats; icd->num_formats = ARRAY_SIZE(sensor_colour_formats); - sensor_ioctrl(icd, Sensor_PowerDown, 1); + return 0; sensor_video_probe_err: - sensor_ioctrl(icd, Sensor_PowerDown, 1); + return ret; } static long sensor_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) -- 2.34.1