diff options
| author | Xinyu Chen <b03824@freescale.com> | 2011-12-29 16:39:54 +0800 |
|---|---|---|
| committer | Xinyu Chen <b03824@freescale.com> | 2011-12-29 16:39:54 +0800 |
| commit | eb61942e81da1be65bc0c0c27f991f70054fe6ac (patch) | |
| tree | 8187bb3800a80f09bcf468c7fa2bedb5605e0cda /drivers/media | |
| parent | 5189c2bec846e6dc695ced6e13f92b9e0322d0b6 (diff) | |
| parent | 042fb9ef67a1e01f8a5bcc4b377803fb2265de1f (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_android
Conflicts:
arch/arm/mach-mx6/board-mx6q_arm2.c
arch/arm/mach-mx6/board-mx6q_sabrelite.c
arch/arm/plat-mxc/dvfs_core.c
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/mxc/capture/ov5642.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/mxc/capture/ov5642.c b/drivers/media/video/mxc/capture/ov5642.c index 0a20b6f6d356..206c96b5ebc7 100644 --- a/drivers/media/video/mxc/capture/ov5642.c +++ b/drivers/media/video/mxc/capture/ov5642.c @@ -1881,6 +1881,7 @@ err: } static int ov5642_init_mode(enum ov5642_frame_rate frame_rate, enum ov5642_mode mode); +static int ov5642_write_snapshot_para(void); static int ov5642_change_mode(enum ov5642_frame_rate frame_rate, enum ov5642_mode new_mode, enum ov5642_mode orig_mode) { @@ -1906,10 +1907,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); |