From: Mauro Carvalho Chehab Date: Fri, 3 Aug 2012 16:52:32 +0000 (-0300) Subject: [media] em28xx: Fix height setting on non-progressive captures X-Git-Tag: Ubuntu-5.13.0-19.19~23571^2~600 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0bc9c894641ad7e2ef937a3e087e32652be35f47;p=mirror_ubuntu-jammy-kernel.git [media] em28xx: Fix height setting on non-progressive captures This was introduced on commit c2a6b54a9: "em28xx: fix: don't do image interlacing on webcams" The proposed patch by Ezequiel is wrong. The right fix here is to just don't bother here if either the image is progressive or not. Reported-by: Ezequiel Garcia Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index de2cb20ad2cc..bed07a6c33f8 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/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