From: Zhaowei Yuan <zhaowei.yuan@samsung.com>
Date: Wed, 6 Aug 2014 01:22:08 +0000 (-0300)
Subject: [media] media: s5p_mfc: Release ctx->ctx if failed to allocate ctx->shm
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6c5c680b85deb98e1b90b5b3e112a6fa82c70b12;p=deliverable%2Flinux.git

[media] media: s5p_mfc: Release ctx->ctx if failed to allocate ctx->shm

ctx->ctx should be released if the following allocation for ctx->shm
gets failed.

Signed-off-by: Zhaowei Yuan <zhaowei.yuan@samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
index 31688cddfead..f88290556e2a 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
@@ -228,6 +228,7 @@ static int s5p_mfc_alloc_instance_buffer_v5(struct s5p_mfc_ctx *ctx)
 	ret = s5p_mfc_alloc_priv_buf(dev->mem_dev_l, &ctx->shm);
 	if (ret) {
 		mfc_err("Failed to allocate shared memory buffer\n");
+		s5p_mfc_release_priv_buf(dev->mem_dev_l, &ctx->ctx);
 		return ret;
 	}