summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSheng Nan <b38800@freescale.com>2013-03-04 14:47:48 +0800
committerSheng Nan <b38800@freescale.com>2013-03-04 14:47:48 +0800
commit6345faccb435226703293582c61154c6bdd77d76 (patch)
treed2920302b1247d58355ab5eaa7eb76b9966fdc1e
parenta80f045818443d712a82b6be2ab250c8348a567b (diff)
ENGR00252559: mxc_v4l2_capture: ov5640: incorrect warning for XGA@15fps
The following warning information should be displayed only when the format is XGA and frame rate is 30fps: pr_warning("ov5640: actual frame rate of XGA is 22.5fps\n"); Signed-off-by: Sheng Nan <b38800@freescale.com>
-rw-r--r--drivers/media/video/mxc/capture/ov5640.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/mxc/capture/ov5640.c b/drivers/media/video/mxc/capture/ov5640.c
index ae057c38bf6a..2a1bc983e28e 100644
--- a/drivers/media/video/mxc/capture/ov5640.c
+++ b/drivers/media/video/mxc/capture/ov5640.c
@@ -1042,7 +1042,7 @@ static int ov5640_change_mode_direct(enum ov5640_frame_rate frame_rate,
ov5640_set_night_mode(night_mode);
/* skip 9 vysnc: start capture at 10th vsync */
- if (mode == ov5640_mode_XGA_1024_768) {
+ if (mode == ov5640_mode_XGA_1024_768 && frame_rate == ov5640_30_fps) {
pr_warning("ov5640: actual frame rate of XGA is 22.5fps\n");
/* 1/22.5 * 9*/
msleep(400);