Skip to content

Commit

Permalink
[media] cx18: Fix warnings introduced during cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Simon Farnsworth authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent 5f70881 commit bea3c54
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/media/video/cx18/cx18-mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit bea3c54

Please sign in to comment.