1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c
index 39a77f0b8860..2547bf88f79f 100644
--- 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;
-                do_gettimeofday(&vb->ts);
+                v4l2_get_timestamp(&vb->ts);
                 if (result != VIDEOBUF_ERROR)
                         vb->field_count++;
                 wake_up(&vb->done);
@@ -1383,12 +1383,12 @@ static void omap1_cam_init_videobuf(struct videobuf_queue *q,
                 videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops,
                                 icd->parent, &pcdev->lock,
                                 V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
-                                sizeof(struct omap1_cam_buf), icd, &icd->video_lock);
+                                sizeof(struct omap1_cam_buf), icd, &ici->host_lock);
         else
                 videobuf_queue_sg_init(q, &omap1_videobuf_ops,
                                 icd->parent, &pcdev->lock,
                                 V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
-                                sizeof(struct omap1_cam_buf), icd, &icd->video_lock);
+                                sizeof(struct omap1_cam_buf), icd, &ici->host_lock);
 
         /* use videobuf mode (auto)selected with the module parameter */
         pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG;