summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/s2255drv.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-09-09 08:29:56 -0700
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-09 08:29:56 -0700
commit7f7b79ee2e731d645dd2cf35a27ae3364cf85306 (patch)
tree108ddf60b6b525ba9bb125716c8cea9329116e91 /linux/drivers/media/video/s2255drv.c
parent487f2205ca8566f1e9a231c0323deaabebf2830a (diff)
downloadmediapointer-dvb-s2-7f7b79ee2e731d645dd2cf35a27ae3364cf85306.tar.gz
mediapointer-dvb-s2-7f7b79ee2e731d645dd2cf35a27ae3364cf85306.tar.bz2
s2255drv field count fix
From: Dean Anderson <dean@sensoray.com> Fixes videobuf field_count Signed-off-by: Dean Anderson <dean@sensoray.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/s2255drv.c')
-rw-r--r--linux/drivers/media/video/s2255drv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/s2255drv.c b/linux/drivers/media/video/s2255drv.c
index 8fae00dac..5a872787e 100644
--- a/linux/drivers/media/video/s2255drv.c
+++ b/linux/drivers/media/video/s2255drv.c
@@ -687,7 +687,7 @@ static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,
(unsigned long)vbuf, pos);
/* tell v4l buffer was filled */
- buf->vb.field_count++;
+ buf->vb.field_count = dev->frame_count[chn] * 2;
do_gettimeofday(&ts);
buf->vb.ts = ts;
buf->vb.state = VIDEOBUF_DONE;
@@ -1304,6 +1304,7 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
dev->last_frame[chn] = -1;
dev->bad_payload[chn] = 0;
dev->cur_frame[chn] = 0;
+ dev->frame_count[chn] = 0;
for (j = 0; j < SYS_FRAMES; j++) {
dev->buffer[chn].frame[j].ulState = S2255_READ_IDLE;
dev->buffer[chn].frame[j].cur_size = 0;