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

Commit 964b76d4 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: Deinit v4l2 control handler at the very end"

parents ad63949d 7cf51cf9

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

+2 −2
Original line number Diff line number Diff line
@@ -1275,6 +1275,8 @@ int msm_vidc_destroy(struct msm_vidc_inst *inst) 
	list_del(&inst->list);

	mutex_unlock(&core->lock);



	msm_comm_ctrl_deinit(inst);



	v4l2_fh_del(&inst->event_handler);

	v4l2_fh_exit(&inst->event_handler);
@@ -1323,8 +1325,6 @@ int msm_vidc_close(void *instance) 
	}

	mutex_unlock(&inst->registeredbufs.lock);



	msm_comm_ctrl_deinit(inst);



	cleanup_instance(inst);

	if (inst->state != MSM_VIDC_CORE_INVALID &&

		inst->core->state != VIDC_CORE_INVALID)