git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.8-rc1' into staging/for_v3.9
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
platform
/
soc_camera
/
omap1_camera.c
diff --git
a/drivers/media/platform/soc_camera/omap1_camera.c
b/drivers/media/platform/soc_camera/omap1_camera.c
index 39a77f0b886066daa82aad7be5e3bf968d6309bf..8f9c1f44544c21d2628ee58ff3bf3dc6781896d2 100644
(file)
--- a/
drivers/media/platform/soc_camera/omap1_camera.c
+++ b/
drivers/media/platform/soc_camera/omap1_camera.c
@@
-592,7
+592,7
@@
static void videobuf_done(struct omap1_cam_dev *pcdev,
suspend_capture(pcdev);
}
vb->state = result;
suspend_capture(pcdev);
}
vb->state = result;
-
do_gettimeofday
(&vb->ts);
+
v4l2_get_timestamp
(&vb->ts);
if (result != VIDEOBUF_ERROR)
vb->field_count++;
wake_up(&vb->done);
if (result != VIDEOBUF_ERROR)
vb->field_count++;
wake_up(&vb->done);