Merge tag 'regmap-v3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[~andy/linux] / drivers / media / usb / cpia2 / cpia2_usb.c

diff --git a/drivers/media/usb/cpia2/cpia2_usb.c b/drivers/media/usb/cpia2/cpia2_usb.c
index 95b5d6e7cdc400d348dcb7462f7806c68e578a43..be17192836099c4e1759e2e7a9d41cf7e9cf3a33 100644 (file)
--- a/drivers/media/usb/cpia2/cpia2_usb.c
+++ b/drivers/media/usb/cpia2/cpia2_usb.c
@@ -328,7 +328,7 @@ static void cpia2_usb_complete(struct urb *urb)
                                continue;
                        }
                        DBG("Start of frame pattern found\n");
-                       do_gettimeofday(&cam->workbuff->timestamp);
+                       v4l2_get_timestamp(&cam->workbuff->timestamp);
                        cam->workbuff->seq = cam->frame_count++;
                        cam->workbuff->data[0] = 0xFF;
                        cam->workbuff->data[1] = 0xD8;