From: Frank Schaefer Date: Sat, 9 Aug 2014 09:37:21 +0000 (-0300) Subject: [media] em28xx-v4l: fix video buffer field order reporting in progressive mode X-Git-Tag: v3.18-rc1~101^2^2~423 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=662c97cf8f9e9d67d45d0a9f0c1565a1ede364c2;p=karo-tx-linux.git [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: Signed-off-by: Frank Schäfer Signed-off-by: Mauro Carvalho Chehab --- 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, 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);