---

yaml --- r: 295114 b: refs/heads/master c: f2354dd h: refs/heads/master v: v3
git-mirror · Mar 20, 2012 · e3a6c56 · e3a6c56
1 parent d616100
commit e3a6c56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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