summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Kudrick <jeff.kudrick@freescale.com>2012-03-12 15:22:57 -0500
committerJeff Kudrick <jeff.kudrick@freescale.com>2012-03-12 15:22:57 -0500
commite01f43c2d2cfce369ed664be63082c4d7f4d936a (patch)
treeb0c0fc64c161502df92aab52285ea9ae6c03e990
parentd77c8e89f64c328ebefbcc12a047010c679baac3 (diff)
ENGR00175612: Camera preview window is overlapped with the picture
In resolving this issue, the new logic to setup capture for 5M snapshot was corrupting the picture. Reverted to original logic. Signed-off-by: Jeff Kudrick <jeff.kudrick@freescale.com>
-rw-r--r--drivers/media/video/mxc/capture/ov5642.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/mxc/capture/ov5642.c b/drivers/media/video/mxc/capture/ov5642.c
index 38f22e7a942a..545d9ca7240b 100644
--- a/drivers/media/video/mxc/capture/ov5642.c
+++ b/drivers/media/video/mxc/capture/ov5642.c
@@ -1887,10 +1887,10 @@ static int ov5642_change_mode(enum ov5642_frame_rate frame_rate,
ov5642_data.pix.height = 480;
return 0;
} else if (new_mode == ov5642_mode_QSXGA_2592_1944 && orig_mode == ov5642_mode_VGA_640_480) {
+ pModeSetting = ov5642_setting_15fps_QSXGA_2592_1944;
+ iModeSettingArySize = ARRAY_SIZE(ov5642_setting_15fps_QSXGA_2592_1944);
ov5642_data.pix.width = 2592;
ov5642_data.pix.height = 1944;
- retval = ov5642_write_snapshot_para();
- return retval;
} else if (new_mode == ov5642_mode_VGA_640_480 && orig_mode == ov5642_mode_QSXGA_2592_1944) {
pModeSetting = ov5642_setting_QSXGA_2_VGA;
iModeSettingArySize = ARRAY_SIZE(ov5642_setting_QSXGA_2_VGA);