From e3a6c56bb8b971e15c3f9c370fcca2d0c9dc27c9 Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Fri, 16 Mar 2012 19:14:54 -0300 Subject: [PATCH] --- yaml --- r: 295114 b: refs/heads/master c: f2354dd180755e25369167eda5de2c226d59fb1d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/marvell-ccic/mcam-core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 872844e70789..ae72e5f7faf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 121bbe254a46e075673e6b9eec5613ea16400ccc +refs/heads/master: f2354dd180755e25369167eda5de2c226d59fb1d diff --git a/trunk/drivers/media/video/marvell-ccic/mcam-core.c b/trunk/drivers/media/video/marvell-ccic/mcam-core.c index e46a72af63c4..036db2746407 100644 --- a/trunk/drivers/media/video/marvell-ccic/mcam-core.c +++ b/trunk/drivers/media/video/marvell-ccic/mcam-core.c @@ -1697,6 +1697,8 @@ int mccic_irq(struct mcam_camera *cam, unsigned int irqs) if (irqs & (IRQ_EOF0 << frame)) { mcam_frame_complete(cam, frame); handled = 1; + if (cam->buffer_mode == B_DMA_sg) + break; } /* * If a frame starts, note that we have DMA active. This