[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 <simon.farnsworth@onelan.co.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c
index 5ecae931ac36df0b10000598c1d827aae9ea8f2a..c07191e09fcbf63578ca85c353fefe63b44df682 100644 (file)
--- 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);