Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192758
b: refs/heads/master
c: 2f51d00
h: refs/heads/master
v: v3
  • Loading branch information
Paulo Assis authored and Mauro Carvalho Chehab committed May 18, 2010
1 parent 14fb48a commit 2f46c3f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e10f73194d63321d020433fa1287e619d4107b79
refs/heads/master: 2f51d00ffa2a41c76fe8a492383e1c1124137694
7 changes: 3 additions & 4 deletions trunk/drivers/media/video/gspca/gspca.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <linux/io.h>
#include <asm/page.h>
#include <linux/uaccess.h>
#include <linux/jiffies.h>
#include <linux/ktime.h>
#include <media/v4l2-ioctl.h>

#include "gspca.h"
Expand Down Expand Up @@ -442,8 +442,7 @@ void gspca_frame_add(struct gspca_dev *gspca_dev,
* is not queued, discard the whole frame */
if (packet_type == FIRST_PACKET) {
frame->data_end = frame->data;
jiffies_to_timeval(get_jiffies_64(),
&frame->v4l2_buf.timestamp);
frame->v4l2_buf.timestamp = ktime_to_timeval(ktime_get());
frame->v4l2_buf.sequence = ++gspca_dev->sequence;
} else if (gspca_dev->last_packet_type == DISCARD_PACKET) {
if (packet_type == LAST_PACKET)
Expand Down Expand Up @@ -2124,7 +2123,7 @@ static ssize_t dev_read(struct file *file, char __user *data,
}

/* get a frame */
jiffies_to_timeval(get_jiffies_64(), &timestamp);
timestamp = ktime_to_timeval(ktime_get());
timestamp.tv_sec--;
n = 2;
for (;;) {
Expand Down

0 comments on commit 2f46c3f

Please sign in to comment.