From: Sheng Nan Date: Mon, 4 Mar 2013 06:47:48 +0000 (+0800) Subject: ENGR00252559: mxc_v4l2_capture: ov5640: incorrect warning for XGA@15fps X-Git-Tag: v3.0.35-fsl~84 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d0a42fad36ef331ecaec572dd7a230e2bf185a8;p=karo-tx-linux.git 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 --- 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);