From c89f116aef94e6aa685d1d261081f0eb67a286bf Mon Sep 17 00:00:00 2001 From: Javier Martin Date: Thu, 22 Dec 2011 12:12:00 -0300 Subject: [PATCH] --- yaml --- r: 285715 b: refs/heads/master c: ccd1a499c1675fef5d2a138617507add63cb81db h: refs/heads/master i: 285713: de4798d808ca01a4803eefd58e31230e66094318 285711: 916d9187adfd82a3cbc5f46e1cea976df9e08665 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mx2_camera.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6a63369a1d7f..f145cbee1788 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f410991dcf1fc3ad1d3311b79b4f1b917224ebed +refs/heads/master: ccd1a499c1675fef5d2a138617507add63cb81db diff --git a/trunk/drivers/media/video/mx2_camera.c b/trunk/drivers/media/video/mx2_camera.c index e635ab3c71e7..04aab0c538aa 100644 --- a/trunk/drivers/media/video/mx2_camera.c +++ b/trunk/drivers/media/video/mx2_camera.c @@ -258,6 +258,7 @@ struct mx2_camera_dev { dma_addr_t discard_buffer_dma; size_t discard_size; struct mx2_fmt_cfg *emma_prp; + u32 frame_count; }; /* buffer for one video frame */ @@ -371,6 +372,7 @@ static int mx2_camera_add_device(struct soc_camera_device *icd) writel(pcdev->csicr1, pcdev->base_csi + CSICR1); pcdev->icd = icd; + pcdev->frame_count = 0; dev_info(icd->parent, "Camera driver attached to camera %d\n", icd->devnum); @@ -1374,7 +1376,8 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, list_del(&vb->queue); vb->state = state; do_gettimeofday(&vb->ts); - vb->field_count++; + vb->field_count = pcdev->frame_count * 2; + pcdev->frame_count++; wake_up(&vb->done); }