Merge "msm: vidc: Add instance to instance list prior to CORE_INIT" (a81d5b3f) · Commits · e / devices / android_kernel_sony_msm8994

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

+10 −3

Original line number	Diff line number	Diff line
		@@ -1306,6 +1306,11 @@ void *msm_vidc_open(int core_id, int session_type)
		"Failed to initialize vb2 queue on capture port\n");
		goto fail_bufq_output;
		}

		mutex_lock(&core->lock);
		list_add_tail(&inst->list, &core->instances);
		mutex_unlock(&core->lock);

		rc = msm_comm_try_state(inst, MSM_VIDC_CORE_INIT);
		if (rc) {
		dprintk(VIDC_ERR,
		@@ -1317,12 +1322,14 @@ void *msm_vidc_open(int core_id, int session_type)

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

		mutex_lock(&core->lock);
		list_add_tail(&inst->list, &core->instances);
		mutex_unlock(&core->lock);
		return inst;
		fail_init:
		vb2_queue_release(&inst->bufq[OUTPUT_PORT].vb2_bufq);

		mutex_lock(&core->lock);
		list_del(&inst->list);
		mutex_unlock(&core->lock);

		fail_bufq_output:
		vb2_queue_release(&inst->bufq[CAPTURE_PORT].vb2_bufq);
		fail_bufq_capture: