From cfc9129f25c5748b5227daccdc7ea7b3330c551e Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Thu, 5 May 2011 09:42:36 -0300 Subject: [PATCH] --- yaml --- r: 250273 b: refs/heads/master c: bea3c54f52ba84ddd8bfc9228255ff501e9b5c21 h: refs/heads/master i: 250271: b5df8ab25da5aa6db7c6506df51af044791f45db v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx18/cx18-mailbox.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 864406dcfea3..4bfe1265cff1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f7088127e800df2cd5ff08140bdca087ab0fbac +refs/heads/master: bea3c54f52ba84ddd8bfc9228255ff501e9b5c21 diff --git a/trunk/drivers/media/video/cx18/cx18-mailbox.c b/trunk/drivers/media/video/cx18/cx18-mailbox.c index 5ecae931ac36..c07191e09fcb 100644 --- a/trunk/drivers/media/video/cx18/cx18-mailbox.c +++ b/trunk/drivers/media/video/cx18/cx18-mailbox.c @@ -164,10 +164,9 @@ static void cx18_mdl_send_to_videobuf(struct cx18_stream *s, { struct cx18_videobuf_buffer *vb_buf; struct cx18_buffer *buf; - u8 *p, u; + u8 *p; u32 offset = 0; int dispatch = 0; - int i; if (mdl->bytesused == 0) return; @@ -203,7 +202,7 @@ static void cx18_mdl_send_to_videobuf(struct cx18_stream *s, } if (dispatch) { - ktime_get_ts(&vb_buf->vb.ts); + vb_buf->vb.ts = ktime_to_timeval(ktime_get()); list_del(&vb_buf->vb.queue); vb_buf->vb.state = VIDEOBUF_DONE; wake_up(&vb_buf->vb.done);