Merge "msm: vidc: Bug fix in instance clean-up" (9222d75c) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/vidc/msm_vidc.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1299,6 +1299,9 @@ int msm_vidc_close(void *instance)
		else if (inst->session_type == MSM_VIDC_ENCODER)
		msm_venc_ctrl_deinit(inst);

		for (i = 0; i < MAX_PORT_NUM; i++)
		vb2_queue_release(&inst->bufq[i].vb2_bufq);

		cleanup_instance(inst);
		if (inst->state != MSM_VIDC_CORE_INVALID &&
		core->state != VIDC_CORE_INVALID)
		@@ -1308,8 +1311,6 @@ int msm_vidc_close(void *instance)
		if (rc)
		dprintk(VIDC_ERR,
		"Failed to move video instance to uninit state\n");
		for (i = 0; i < MAX_PORT_NUM; i++)
		vb2_queue_release(&inst->bufq[i].vb2_bufq);

		pr_info(VIDC_DBG_TAG "Closed video instance: %p\n", VIDC_INFO, inst);
		kfree(inst);