diff --git a/[refs] b/[refs] index 66ed484a2f54..d800279dad16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7226d8ebdd3a944db44334f0a910e70abcc0abbf +refs/heads/master: 685a39bd1a05dba17cb7ba18ab74364ad51bc527 diff --git a/trunk/drivers/media/v4l2-core/v4l2-common.c b/trunk/drivers/media/v4l2-core/v4l2-common.c index f995dd31151d..380ddd89fa4c 100644 --- a/trunk/drivers/media/v4l2-core/v4l2-common.c +++ b/trunk/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;