diff options
Diffstat (limited to 'drivers/media/pci/sta2x11/sta2x11_vip.c')
| -rw-r--r-- | drivers/media/pci/sta2x11/sta2x11_vip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c index d384a6b0b09f..59b3a36a3639 100644 --- a/drivers/media/pci/sta2x11/sta2x11_vip.c +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c | |||
| @@ -813,7 +813,7 @@ static irqreturn_t vip_irq(int irq, struct sta2x11_vip *vip) | |||
| 813 | /* Disable acquisition */ | 813 | /* Disable acquisition */ |
| 814 | reg_write(vip, DVP_CTL, reg_read(vip, DVP_CTL) & ~DVP_CTL_ENA); | 814 | reg_write(vip, DVP_CTL, reg_read(vip, DVP_CTL) & ~DVP_CTL_ENA); |
| 815 | /* Remove the active buffer from the list */ | 815 | /* Remove the active buffer from the list */ |
| 816 | do_gettimeofday(&vip->active->vb.v4l2_buf.timestamp); | 816 | v4l2_get_timestamp(&vip->active->vb.v4l2_buf.timestamp); |
| 817 | vip->active->vb.v4l2_buf.sequence = vip->sequence++; | 817 | vip->active->vb.v4l2_buf.sequence = vip->sequence++; |
| 818 | vb2_buffer_done(&vip->active->vb, VB2_BUF_STATE_DONE); | 818 | vb2_buffer_done(&vip->active->vb, VB2_BUF_STATE_DONE); |
| 819 | } | 819 | } |
| @@ -864,6 +864,7 @@ static int sta2x11_vip_init_buffer(struct sta2x11_vip *vip) | |||
| 864 | vip->vb_vidq.buf_struct_size = sizeof(struct vip_buffer); | 864 | vip->vb_vidq.buf_struct_size = sizeof(struct vip_buffer); |
| 865 | vip->vb_vidq.ops = &vip_video_qops; | 865 | vip->vb_vidq.ops = &vip_video_qops; |
| 866 | vip->vb_vidq.mem_ops = &vb2_dma_contig_memops; | 866 | vip->vb_vidq.mem_ops = &vb2_dma_contig_memops; |
| 867 | vip->vb_vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; | ||
| 867 | err = vb2_queue_init(&vip->vb_vidq); | 868 | err = vb2_queue_init(&vip->vb_vidq); |
| 868 | if (err) | 869 | if (err) |
| 869 | return err; | 870 | return err; |
