Merge "msm: vidc: Fix race condition with v4l2 event handler" (ffab4490) · Commits · e / devices / android_kernel_xiaomi_markw

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -1198,6 +1198,8 @@ void *msm_vidc_open(int core_id, int session_type)
		goto fail_bufq_output;
		}

		setup_event_queue(inst, &core->vdev[session_type].vdev);

		mutex_lock(&core->lock);
		list_add_tail(&inst->list, &core->instances);
		mutex_unlock(&core->lock);
		@@ -1211,10 +1213,10 @@ void *msm_vidc_open(int core_id, int session_type)
		inst->debugfs_root =
		msm_vidc_debugfs_init_inst(inst, core->debugfs_root);

		setup_event_queue(inst, &core->vdev[session_type].vdev);

		return inst;
		fail_init:
		v4l2_fh_del(&inst->event_handler);
		v4l2_fh_exit(&inst->event_handler);
		vb2_queue_release(&inst->bufq[OUTPUT_PORT].vb2_bufq);

		mutex_lock(&core->lock);