aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/s2255/s2255drv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/usb/s2255/s2255drv.c')
-rw-r--r--drivers/media/usb/s2255/s2255drv.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 8ebec0d7bf59..498c57ea5d32 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -593,7 +593,7 @@ static int s2255_got_frame(struct s2255_channel *channel, int jpgsize)
593 buf = list_entry(dma_q->active.next, 593 buf = list_entry(dma_q->active.next,
594 struct s2255_buffer, vb.queue); 594 struct s2255_buffer, vb.queue);
595 list_del(&buf->vb.queue); 595 list_del(&buf->vb.queue);
596 do_gettimeofday(&buf->vb.ts); 596 v4l2_get_timestamp(&buf->vb.ts);
597 s2255_fillbuff(channel, buf, jpgsize); 597 s2255_fillbuff(channel, buf, jpgsize);
598 wake_up(&buf->vb.done); 598 wake_up(&buf->vb.done);
599 dprintk(2, "%s: [buf/i] [%p/%d]\n", __func__, buf, buf->vb.i); 599 dprintk(2, "%s: [buf/i] [%p/%d]\n", __func__, buf, buf->vb.i);
@@ -629,7 +629,6 @@ static void s2255_fillbuff(struct s2255_channel *channel,
629 struct s2255_buffer *buf, int jpgsize) 629 struct s2255_buffer *buf, int jpgsize)
630{ 630{
631 int pos = 0; 631 int pos = 0;
632 struct timeval ts;
633 const char *tmpbuf; 632 const char *tmpbuf;
634 char *vbuf = videobuf_to_vmalloc(&buf->vb); 633 char *vbuf = videobuf_to_vmalloc(&buf->vb);
635 unsigned long last_frame; 634 unsigned long last_frame;
@@ -674,8 +673,7 @@ static void s2255_fillbuff(struct s2255_channel *channel,
674 /* tell v4l buffer was filled */ 673 /* tell v4l buffer was filled */
675 674
676 buf->vb.field_count = channel->frame_count * 2; 675 buf->vb.field_count = channel->frame_count * 2;
677 do_gettimeofday(&ts); 676 v4l2_get_timestamp(&buf->vb.ts);
678 buf->vb.ts = ts;
679 buf->vb.state = VIDEOBUF_DONE; 677 buf->vb.state = VIDEOBUF_DONE;
680} 678}
681 679