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

Commit 14678075 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 53c61498 on remote branch 

Change-Id: I764904f69e913bd87f04b87d22cee6e35dd710e6
parents 4446dfc4 53c61498

msm/vidc/msm_cvp_internal.c

+2 −1
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ static int msm_cvp_register_buffer(struct msm_vidc_inst *inst, 
		goto exit;

	}



	mutex_lock(&inst->cvpbufs.lock);

	memset(&vbuf, 0, sizeof(struct vidc_register_buffer));

	vbuf.index = buf->index;

	vbuf.type = get_hal_buftype(__func__, buf->type, inst->sid);
@@ -388,9 +389,9 @@ static int msm_cvp_register_buffer(struct msm_vidc_inst *inst, 
			(void *)inst->session, &vbuf);

	if (rc) {

		print_cvp_buffer(VIDC_ERR, "register failed", inst, cbuf);

		mutex_unlock(&inst->cvpbufs.lock);

		goto exit;

	}

	mutex_lock(&inst->cvpbufs.lock);

	list_add_tail(&cbuf->list, &inst->cvpbufs.list);

	mutex_unlock(&inst->cvpbufs.lock);

	return rc;