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>

diff --git a/drivers/media/video/mxc/capture/ov5640.c b/drivers/media/video/mxc/capture/ov5640.c
index ae057c38bf6a890890a706d3ffd1f735c75e2563..2a1bc983e28e0a478f5cfec8a027707533c5a5ee 100644 (file)
--- 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);