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

Commit 01a16bd3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: delete v4l2 controls after queue release"

parents 94307ac3 ad8cd1c4

msm/vidc/msm_vidc.c

+3 −3
Original line number Diff line number Diff line
@@ -1810,6 +1810,9 @@ int msm_vidc_destroy(struct msm_vidc_inst *inst) 


	core = inst->core;



	for (i = 0; i < MAX_PORT_NUM; i++)

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



	mutex_lock(&core->lock);

	/* inst->list lives in core->instances */

	list_del(&inst->list);
@@ -1820,9 +1823,6 @@ int msm_vidc_destroy(struct msm_vidc_inst *inst) 
	v4l2_fh_del(&inst->event_handler);

	v4l2_fh_exit(&inst->event_handler);



	for (i = 0; i < MAX_PORT_NUM; i++)

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



	DEINIT_MSM_VIDC_LIST(&inst->scratchbufs);

	DEINIT_MSM_VIDC_LIST(&inst->persistbufs);

	DEINIT_MSM_VIDC_LIST(&inst->pending_getpropq);