Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4edc6e28 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: fix mutex lock issue"

parents 8c41e4e6 b8a19f3e

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

+5 −5
Original line number Diff line number Diff line
@@ -1320,11 +1320,6 @@ int msm_vidc_destroy(struct msm_vidc_inst *inst) 


	msm_comm_ctrl_deinit(inst);



	mutex_destroy(&inst->sync_lock);

	mutex_destroy(&inst->bufq[CAPTURE_PORT].lock);

	mutex_destroy(&inst->bufq[OUTPUT_PORT].lock);

	mutex_destroy(&inst->lock);



	DEINIT_MSM_VIDC_LIST(&inst->pendingq);

	DEINIT_MSM_VIDC_LIST(&inst->scratchbufs);

	DEINIT_MSM_VIDC_LIST(&inst->persistbufs);
@@ -1338,6 +1333,11 @@ int msm_vidc_destroy(struct msm_vidc_inst *inst) 
	for (i = 0; i < MAX_PORT_NUM; i++)

		vb2_queue_release(&inst->bufq[i].vb2_bufq);



	mutex_destroy(&inst->sync_lock);

	mutex_destroy(&inst->bufq[CAPTURE_PORT].lock);

	mutex_destroy(&inst->bufq[OUTPUT_PORT].lock);

	mutex_destroy(&inst->lock);



	pr_info(VIDC_DBG_TAG "Closed video instance: %pK\n",

			VIDC_MSG_PRIO2STRING(VIDC_INFO), inst);

	kfree(inst);

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

+1 −1
Original line number Diff line number Diff line
@@ -1666,7 +1666,7 @@ static void handle_sys_error(enum hal_command_response cmd, void *data) 
	 */



	mutex_lock(&core->lock);

	inst = list_first_entry(&core->instances,

	inst = list_first_entry_or_null(&core->instances,

		struct msm_vidc_inst, list);

	mutex_unlock(&core->lock);