diff options
author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2014-08-09 05:37:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 16:25:38 -0400 |
commit | 662c97cf8f9e9d67d45d0a9f0c1565a1ede364c2 (patch) | |
tree | 5172e3050f0d55108f728cae6fced1d6d7e24861 | |
parent | 627530c32a43283474e9dd3e954519410ffa033a (diff) |
[media] em28xx-v4l: fix video buffer field order reporting in progressive mode
The correct field order in progressive mode is V4L2_FIELD_NONE, not V4L2_FIELD_INTERLACED.
Cc: <stable@vger.kernel.org>
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 9db219d513db..f6cf99fa30b2 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c | |||
@@ -435,7 +435,10 @@ static inline void finish_buffer(struct em28xx *dev, | |||
435 | em28xx_isocdbg("[%p/%d] wakeup\n", buf, buf->top_field); | 435 | em28xx_isocdbg("[%p/%d] wakeup\n", buf, buf->top_field); |
436 | 436 | ||
437 | buf->vb.v4l2_buf.sequence = dev->v4l2->field_count++; | 437 | buf->vb.v4l2_buf.sequence = dev->v4l2->field_count++; |
438 | buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED; | 438 | if (dev->v4l2->progressive) |
439 | buf->vb.v4l2_buf.field = V4L2_FIELD_NONE; | ||
440 | else | ||
441 | buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED; | ||
439 | v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); | 442 | v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); |
440 | 443 | ||
441 | vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); | 444 | vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); |