---

yaml --- r: 331131 b: refs/heads/master c: e34db06 h: refs/heads/master i: 331129: 84cd003 331127: 1a34d94 v: v3
git-mirror · Sep 26, 2012 · 9aea111 · 9aea111
1 parent 1c66c3d
commit 9aea111
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c566c78900acf38d6f2d004674b9cb062bbe3671
+refs/heads/master: e34db0661dc7945e5412a568f38dd170c78099d1
diff --git a/trunk/drivers/media/platform/coda.c b/trunk/drivers/media/platform/coda.c
@@ -818,18 +818,11 @@ static int coda_queue_setup(struct vb2_queue *vq,
 				unsigned int sizes[], void *alloc_ctxs[])
 {
 	struct coda_ctx *ctx = vb2_get_drv_priv(vq);
+	struct coda_q_data *q_data;
 	unsigned int size;
 
-	if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
-		if (fmt)
-			size = fmt->fmt.pix.width *
-				fmt->fmt.pix.height * 3 / 2;
-		else
-			size = MAX_W *
-				MAX_H * 3 / 2;
-	} else {
-		size = CODA_MAX_FRAME_SIZE;
-	}
+	q_data = get_q_data(ctx, vq->type);
+	size = q_data->sizeimage;
 
 	*nplanes = 1;
 	sizes[0] = size;