| Message ID | 1304599356-21951-1-git-send-email-simon.farnsworth@onelan.co.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Em 05-05-2011 09:42, Simon Farnsworth escreveu: > 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> > --- > Mauro, > > You may want to squash this in with the cleanup patch itself - it's > plain and simple oversight on my part (I should have seen the compiler > warnings), and I should not have sent the cleanup patch to you without > fixing these errors. > It will all depend on how much time I'll have during the next merge window. I can't do it at the already-applied patches, as other people use it as basis, and a rebase there would break its clones. Mauro. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday 5 May 2011, Mauro Carvalho Chehab <mchehab@infradead.org> wrote: > Em 05-05-2011 09:42, Simon Farnsworth escreveu: > > 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> > > --- > > Mauro, > > > > You may want to squash this in with the cleanup patch itself - it's > > plain and simple oversight on my part (I should have seen the compiler > > warnings), and I should not have sent the cleanup patch to you without > > fixing these errors. > > It will all depend on how much time I'll have during the next merge window. > I can't do it at the already-applied patches, as other people use it as > basis, and a rebase there would break its clones. > > Mauro. No problem; if it ends up as a separate patch in the tree, it's not going to hurt, as the version with warnings functions adequately enough to not break bisection.
diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c index 5ecae93..c07191e 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);
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> --- Mauro, You may want to squash this in with the cleanup patch itself - it's plain and simple oversight on my part (I should have seen the compiler warnings), and I should not have sent the cleanup patch to you without fixing these errors. Sorry, Simon drivers/media/video/cx18/cx18-mailbox.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)