Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[~andy/linux] / drivers / media / v4l2-core / v4l2-common.c

diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index f995dd31151d0cc36bce91110e8ca3c0443c0138..380ddd89fa4c6f8d6c1bb1b612eeb97fa8420a9f 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -837,7 +837,7 @@ bool v4l2_detect_gtf(unsigned frame_height,
                struct v4l2_dv_timings *fmt)
 {
        int pix_clk;
-       int  v_fp, v_bp, h_fp, h_bp, hsync;
+       int  v_fp, v_bp, h_fp, hsync;
        int frame_width, image_height, image_width;
        bool default_gtf;
        int h_blank;
@@ -885,7 +885,6 @@ bool v4l2_detect_gtf(unsigned frame_height,
        hsync = hsync - hsync % GTF_CELL_GRAN;
 
        h_fp = h_blank / 2 - hsync;
-       h_bp = h_blank / 2;
 
        fmt->bt.polarities = polarities;
        fmt->bt.width = image_width;