The patch number 8963 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        [EMAIL PROTECTED]

------

From: Dean Anderson  <[EMAIL PROTECTED]>
s2255drv field count fix


Fixes videobuf field_count

Signed-off-by: Dean Anderson <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>


---

 linux/drivers/media/video/s2255drv.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -r b85596a18898 -r e5ca4534b543 linux/drivers/media/video/s2255drv.c
--- a/linux/drivers/media/video/s2255drv.c      Sun Sep 07 10:58:54 2008 +0200
+++ b/linux/drivers/media/video/s2255drv.c      Tue Sep 09 08:29:56 2008 -0700
@@ -687,7 +687,7 @@ static void s2255_fillbuff(struct s2255_
                (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 *
        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;


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/e5ca4534b5438b321226cb5393026b72a3382759

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to