diff options
author | Simon Farnsworth <simon.farnsworth@onelan.co.uk> | 2011-05-05 08:42:36 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 08:30:48 -0400 |
commit | bea3c54f52ba84ddd8bfc9228255ff501e9b5c21 (patch) | |
tree | e5ecc48a2bf9ee53b4649c5a479baeca034b1838 | |
parent | 5f7088127e800df2cd5ff08140bdca087ab0fbac (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>
-rw-r--r-- | drivers/media/video/cx18/cx18-mailbox.c | 5 |
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, | |||
164 | { | 164 | { |
165 | struct cx18_videobuf_buffer *vb_buf; | 165 | struct cx18_videobuf_buffer *vb_buf; |
166 | struct cx18_buffer *buf; | 166 | struct cx18_buffer *buf; |
167 | u8 *p, u; | 167 | u8 *p; |
168 | u32 offset = 0; | 168 | u32 offset = 0; |
169 | int dispatch = 0; | 169 | int dispatch = 0; |
170 | int i; | ||
171 | 170 | ||
172 | if (mdl->bytesused == 0) | 171 | if (mdl->bytesused == 0) |
173 | return; | 172 | return; |
@@ -203,7 +202,7 @@ static void cx18_mdl_send_to_videobuf(struct cx18_stream *s, | |||
203 | } | 202 | } |
204 | 203 | ||
205 | if (dispatch) { | 204 | if (dispatch) { |
206 | ktime_get_ts(&vb_buf->vb.ts); | 205 | vb_buf->vb.ts = ktime_to_timeval(ktime_get()); |
207 | list_del(&vb_buf->vb.queue); | 206 | list_del(&vb_buf->vb.queue); |
208 | vb_buf->vb.state = VIDEOBUF_DONE; | 207 | vb_buf->vb.state = VIDEOBUF_DONE; |
209 | wake_up(&vb_buf->vb.done); | 208 | wake_up(&vb_buf->vb.done); |