From bea3c54f52ba84ddd8bfc9228255ff501e9b5c21 Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Thu, 5 May 2011 09:42:36 -0300 Subject: [PATCH] [media] cx18: Fix warnings introduced during cleanup I misused the ktime API, and failed to remove some traces of the in-kernel format conversion. Fix these, so the the driver builds without warnings. Signed-off-by: Simon Farnsworth Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/cx18/cx18-mailbox.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c index 5ecae931ac36..c07191e09fcb 100644 --- a/drivers/media/video/cx18/cx18-mailbox.c +++ b/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); -- 2.34.1