From fb35209b7f15bb9b81e38eabb2e6b49129921f74 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 3 Aug 2012 13:52:32 -0300 Subject: [PATCH] --- yaml --- r: 330769 b: refs/heads/master c: 0bc9c894641ad7e2ef937a3e087e32652be35f47 h: refs/heads/master i: 330767: a4632957d8797ea6f8a65ea2d904a08dc6b63790 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-core.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f31fb1553e3a..5bfd7c61a0f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 229fd7d2f19c650c34034885180f91574e837bbb +refs/heads/master: 0bc9c894641ad7e2ef937a3e087e32652be35f47 diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c index de2cb20ad2cc..bed07a6c33f8 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-core.c +++ b/trunk/drivers/media/video/em28xx/em28xx-core.c @@ -785,12 +785,8 @@ int em28xx_resolution_set(struct em28xx *dev) else dev->vbi_height = 18; - if (!dev->progressive) - height >>= norm_maxh(dev); - em28xx_set_outfmt(dev); - em28xx_accumulator_set(dev, 1, (width - 4) >> 2, 1, (height - 4) >> 2); /* If we don't set the start position to 2 in VBI mode, we end up