shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera: ov5642 capture focus is error in const focus

Browse Source
This commit is contained in:
ddl
2011-05-04 15:25:26 +08:00
parent 1e06c946b9
commit 384189345d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/video/ov5642.c
View File

@@ -4390,11 +4390,6 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
{
if (sensor_fmt_capturechk(sd,f) == true) { /* ddl@rock-chips.com : Capture */
sensor_parameter_record(client);
#if CONFIG_SENSOR_Focus
sensor_af_idlechk(client);
if (sensor->info_priv.auto_focus == SENSOR_AF_MODE_CONTINUOUS)
sensor_af_cmdset(client, PauseFocus_Cmd, NULL);
#endif
#if CONFIG_SENSOR_Flash
if ((sensor->info_priv.flash == 1) || (sensor->info_priv.flash == 2)) {
sensor_ioctrl(icd, Sensor_Flash, Flash_On);
@@ -4442,6 +4437,12 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
qctrl = soc_camera_find_qctrl(&sensor_ops, V4L2_CID_DO_WHITE_BALANCE);
sensor_set_whiteBalance(icd, qctrl,sensor->info_priv.whiteBalance);
}
#if CONFIG_SENSOR_Focus
sensor_af_zoneupdate(client);
if (sensor->info_priv.auto_focus == SENSOR_AF_MODE_CONTINUOUS) {
sensor_af_const(client);
}
#endif
sensor->info_priv.snap2preview = true;
} else if (sensor_fmt_videochk(sd,f) == true) { /* ddl@rock-chips.com : Video */
qctrl = soc_camera_find_qctrl(&sensor_ops, V4L2_CID_EFFECT);