Merge tag 'v3.14-rc5' into patchwork

[mirror_ubuntu-artful-kernel.git] / drivers / media / v4l2-core / v4l2-dv-timings.c

diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c
index 41bf3f9b6ca6a1e46077e193599a14dee29afacf..f63a6bdc7d4686bc5e0ed330c8fa6fad1576479b 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-dv-timings.c
+++ b/drivers/media/v4l2-core/v4l2-dv-timings.c
@@ -519,6 +519,7 @@ bool v4l2_detect_gtf(unsigned frame_height,
                aspect.denominator = 9;
        }
        image_width = ((image_height * aspect.numerator) / aspect.denominator);
+       image_width = (image_width + GTF_CELL_GRAN/2) & ~(GTF_CELL_GRAN - 1);
 
        /* Horizontal */
        if (default_gtf)