From 5c420492edea15656762dde3c1bb1df05eec0ed8 Mon Sep 17 00:00:00 2001 From: George Shen Date: Tue, 7 Apr 2020 14:27:10 -0700 Subject: [PATCH] msm: cvp: Avoid releasing buffers during boot CVP auto PIL opens CVP for early initialization. However session buffers were not created in that case. Avoid releasing buffers if session is created for auto PIL. Change-Id: I3339f1b865b0e106af0bbed47ad067e2d183e5b5 Signed-off-by: George Shen --- drivers/media/platform/msm/cvp/msm_cvp_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/msm/cvp/msm_cvp_core.c b/drivers/media/platform/msm/cvp/msm_cvp_core.c index 1fce69b97e0c..c7cf32fcc8a4 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp_core.c +++ b/drivers/media/platform/msm/cvp/msm_cvp_core.c @@ -457,10 +457,10 @@ int msm_cvp_close(void *instance) return -EINVAL; } - msm_cvp_cleanup_instance(inst); - - if (inst->session_type != MSM_CVP_BOOT) + if (inst->session_type != MSM_CVP_BOOT) { + msm_cvp_cleanup_instance(inst); msm_cvp_session_deinit(inst); + } rc = msm_cvp_comm_try_state(inst, MSM_CVP_CORE_UNINIT); if (rc) {