---

yaml --- r: 356972 b: refs/heads/master c: 4a8a804 h: refs/heads/master v: v3
git-mirror · Dec 4, 2012 · 6188116 · 6188116
1 parent 873e138
commit 6188116
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc1ebd704751bb6b86612e63fdfac56918364d07
+refs/heads/master: 4a8a8042be289f6d53fc6cbfbed1722db14d7af1
diff --git a/trunk/drivers/media/platform/soc_camera/mx2_camera.c b/trunk/drivers/media/platform/soc_camera/mx2_camera.c
@@ -879,7 +879,7 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count)
 		pcdev->discard_size = icd->user_height * bytesperline;
 		pcdev->discard_buffer = dma_alloc_coherent(ici->v4l2_dev.dev,
 				pcdev->discard_size, &pcdev->discard_buffer_dma,
-				GFP_KERNEL);
+				GFP_ATOMIC);
 		if (!pcdev->discard_buffer) {
 			spin_unlock_irqrestore(&pcdev->lock, flags);
 			return -ENOMEM;