From 9aea11148a09a587530abdf91d77a9f1f6b3dd64 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Wed, 29 Aug 2012 08:22:00 -0300
Subject: [PATCH] --- yaml --- r: 331131 b: refs/heads/master c:
 e34db0661dc7945e5412a568f38dd170c78099d1 h: refs/heads/master i:   331129:
 84cd00319b42c1758d0e7d9ab0a569f1653dbbe7   331127:
 1a34d94a7a1e3817895dd3dfa435d3af812179b7 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/platform/coda.c | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index ead9759ade8b..640e62945146 100644
--- 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
index bf8cb0a317bd..cd04ae252c30 100644
--- 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;