diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-03 13:52:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-12 07:09:06 -0300 |
| commit | 0bc9c894641ad7e2ef937a3e087e32652be35f47 (patch) | |
| tree | c2fa4b119f3d08051cecc47ed21b162e6197806d /drivers/media/video | |
| parent | 229fd7d2f19c650c34034885180f91574e837bbb (diff) | |
| download | linux-0bc9c894641ad7e2ef937a3e087e32652be35f47.tar.gz linux-0bc9c894641ad7e2ef937a3e087e32652be35f47.tar.xz | |
[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 <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 4 |
1 files changed, 0 insertions, 4 deletions
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 |