Commit 0bc9c894 authored Aug 03, 2012 by Mauro Carvalho Chehab

[media] em28xx: Fix height setting on non-progressive captures



This was introduced on commit c2a6b54a:
"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 <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 229fd7d2

drivers/media/video/em28xx/em28xx-core.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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