tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (8963): s2255drv field count fix

Fixes videobuf field_count

Signed-off-by: Dean Anderson <dean@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by Dean Anderson and committed by Mauro Carvalho Chehab a1c4530e a30ee3c7

+2 -1
unified split
+2 -1
drivers/media/video/s2255drv.c
··· 669 (unsigned long)vbuf, pos); 670 /* tell v4l buffer was filled */ 671 672 - buf->vb.field_count++; 673 do_gettimeofday(&ts); 674 buf->vb.ts = ts; 675 buf->vb.state = VIDEOBUF_DONE; ··· 1268 dev->last_frame[chn] = -1; 1269 dev->bad_payload[chn] = 0; 1270 dev->cur_frame[chn] = 0; 1271 for (j = 0; j < SYS_FRAMES; j++) { 1272 dev->buffer[chn].frame[j].ulState = 0; 1273 dev->buffer[chn].frame[j].cur_size = 0;
··· 669 (unsigned long)vbuf, pos); 670 /* tell v4l buffer was filled */ 671 672 + buf->vb.field_count = dev->frame_count[chn] * 2; 673 do_gettimeofday(&ts); 674 buf->vb.ts = ts; 675 buf->vb.state = VIDEOBUF_DONE; ··· 1268 dev->last_frame[chn] = -1; 1269 dev->bad_payload[chn] = 0; 1270 dev->cur_frame[chn] = 0; 1271 + dev->frame_count[chn] = 0; 1272 for (j = 0; j < SYS_FRAMES; j++) { 1273 dev->buffer[chn].frame[j].ulState = 0; 1274 dev->buffer[chn].frame[j].cur_size = 0;