summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeepak Kushwah <dkushwah@codeaurora.org>2017-08-18 11:54:56 +0530
committerDeepak Kushwah <dkushwah@codeaurora.org>2017-08-18 11:55:26 +0530
commitf2af76194a1ced422bc47a13c690e16e92f1cf1e (patch)
tree2bd0be11eca14be4b031bf2c3eff17c3f0f2f993
parenta49bb61510b938152025049730fa922c5da950a1 (diff)
msm: vidc: Avoid setting internal scratch buffers if not required
In case of no requirement of internal scratch buffers, driver propagate error to upper layer leading to stream on failure. This commit could avoid setting scratch buffers when there is no requirement. Change-Id: Iedcac8a54f2ae4136b6d885b3955927d4566d9db Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
-rw-r--r--drivers/media/platform/msm/vidc/msm_vdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vdec.c b/drivers/media/platform/msm/vidc/msm_vdec.c
index 0f6389370643..78cced2abd47 100644
--- a/drivers/media/platform/msm/vidc/msm_vdec.c
+++ b/drivers/media/platform/msm/vidc/msm_vdec.c
@@ -1618,6 +1618,8 @@ static int set_max_internal_buffers_size(struct msm_vidc_inst *inst)
get_buff_req_buffer(inst, internal_buffers[i].type);
internal_buffers[i].size = internal_buffers[i].req ?
internal_buffers[i].req->buffer_size : 0;
+ if (internal_buffers[i].req == NULL)
+ continue;
rc = allocate_and_set_internal_bufs(inst,
internal_buffers[i].req,