Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / media / platform / davinci / vpif_capture.c

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 52ac5e6..650b6f1 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -272,13 +272,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
        unsigned long flags;
        int ret;
 
-       /* If buffer queue is empty, return error */
        spin_lock_irqsave(&common->irqlock, flags);
-       if (list_empty(&common->dma_queue)) {
-               spin_unlock_irqrestore(&common->irqlock, flags);
-               vpif_dbg(1, debug, "buffer queue is empty\n");
-               return -EIO;
-       }
 
        /* Get the next frame from the buffer queue */
        common->cur_frm = common->next_frm = list_entry(common->dma_queue.next,
@@ -1023,7 +1017,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
        q->ops = &video_qops;
        q->mem_ops = &vb2_dma_contig_memops;
        q->buf_struct_size = sizeof(struct vpif_cap_buffer);
-       q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+       q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
        ret = vb2_queue_init(q);
        if (ret) {