summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorSimon Farnsworth <simon.farnsworth@onelan.co.uk>2011-05-05 09:42:36 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 09:30:48 -0300
commitbea3c54f52ba84ddd8bfc9228255ff501e9b5c21 (patch)
treee5ecc48a2bf9ee53b4649c5a479baeca034b1838 /drivers/media
parent5f7088127e800df2cd5ff08140bdca087ab0fbac (diff)
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx18/cx18-mailbox.c5
1 files 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);