summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-07-11 06:36:15 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-21 15:52:37 -0300
commitaed14b0a625dee567dcc5d94022ddd2951294cfc (patch)
tree5e4f8962e2a28b1eefc41d20d136bb8f0be62d81
parent594a750b37efb21a6967851fd19b6a9b6aca2c48 (diff)
downloadop-kernel-dev-aed14b0a625dee567dcc5d94022ddd2951294cfc.zip
op-kernel-dev-aed14b0a625dee567dcc5d94022ddd2951294cfc.tar.gz
[media] coda: fix internal framebuffer allocation size
This error was introduced by 5677e3b04d3b3961200aa2bb9cc715e709eafeb9 "[media] coda: update CODA7541 to firmware 1.4.50". Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/platform/coda.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index d777801..21c272e 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -1525,10 +1525,10 @@ static int coda_alloc_framebuffers(struct coda_ctx *ctx, struct coda_q_data *q_d
for (i = 0; i < ctx->num_internal_frames; i++) {
size_t size;
- size = q_data->sizeimage;
+ size = ysize + ysize / 2;
if (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264 &&
dev->devtype->product != CODA_DX6)
- ctx->internal_frames[i].size += ysize/4;
+ size += ysize / 4;
ret = coda_alloc_context_buf(ctx, &ctx->internal_frames[i], size);
if (ret < 0) {
coda_free_framebuffers(ctx);
OpenPOWER on IntegriCloud