| From 662c97cf8f9e9d67d45d0a9f0c1565a1ede364c2 Mon Sep 17 00:00:00 2001 |
| From: Frank Schaefer <fschaefer.oss@googlemail.com> |
| Date: Sat, 9 Aug 2014 06:37:21 -0300 |
| Subject: media: em28xx-v4l: fix video buffer field order reporting in progressive mode |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Frank Schaefer <fschaefer.oss@googlemail.com> |
| |
| commit 662c97cf8f9e9d67d45d0a9f0c1565a1ede364c2 upstream. |
| |
| The correct field order in progressive mode is V4L2_FIELD_NONE, not V4L2_FIELD_INTERLACED. |
| |
| Signed-off-by: Frank Schรคfer <fschaefer.oss@googlemail.com> |
| Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/usb/em28xx/em28xx-video.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- 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_isocdbg("[%p/%d] wakeup\n", buf, buf->top_field); |
| |
| buf->vb.v4l2_buf.sequence = dev->v4l2->field_count++; |
| - buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED; |
| + if (dev->v4l2->progressive) |
| + buf->vb.v4l2_buf.field = V4L2_FIELD_NONE; |
| + else |
| + buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED; |
| v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); |
| |
| vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); |
