diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-03-29 15:12:10 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-29 15:12:21 +0100 |
| commit | 6aeedba20e82150757f2dd5b896f0e09491a987c (patch) | |
| tree | d33322d9a9bd8c1b3d16019820a3305c3692385b /drivers/media/platform/fsl-viu.c | |
| parent | HID: multitouch: fix touchpad buttons (diff) | |
| parent | Linux 3.9-rc1 (diff) | |
| download | linux-6aeedba20e82150757f2dd5b896f0e09491a987c.tar.xz linux-6aeedba20e82150757f2dd5b896f0e09491a987c.zip | |
Merge tag v3.9-rc1 into for-3.9/upstream-fixes
This is done so that I am able to apply fix for commit
0322bd3980b3 ("usb hid quirks for Masterkit MA901 usb radio") which
went into 3.9-rc1.
Diffstat (limited to 'drivers/media/platform/fsl-viu.c')
| -rw-r--r-- | drivers/media/platform/fsl-viu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 9115a2c8d075..5f7db3f1f6f5 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c @@ -1181,7 +1181,7 @@ static void viu_capture_intr(struct viu_dev *dev, u32 status) if (waitqueue_active(&buf->vb.done)) { list_del(&buf->vb.queue); - do_gettimeofday(&buf->vb.ts); + v4l2_get_timestamp(&buf->vb.ts); buf->vb.state = VIDEOBUF_DONE; buf->vb.field_count++; wake_up(&buf->vb.done); |