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

Commit ad57fa09 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: Fail qbuf and prepare_buf incase of error"

parents 9ac41498 f73b186f

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

+10 −2
Original line number Diff line number Diff line
@@ -693,7 +693,11 @@ int msm_vidc_prepare_buf(void *instance, struct v4l2_buffer *b) 
{

	struct msm_vidc_inst *inst = instance;



	if (!inst || !b || !valid_v4l2_buffer(b, inst))

	if (!inst || !inst->core || !b || !valid_v4l2_buffer(b, inst))

		return -EINVAL;



	if (inst->state == MSM_VIDC_CORE_INVALID ||

		inst->core->state == VIDC_CORE_INVALID)

		return -EINVAL;



	if (is_dynamic_output_buffer_mode(b, inst))
@@ -815,7 +819,11 @@ int msm_vidc_qbuf(void *instance, struct v4l2_buffer *b) 
	int rc = 0;

	int i;



	if (!inst || !b || !valid_v4l2_buffer(b, inst))

	if (!inst || !inst->core || !b || !valid_v4l2_buffer(b, inst))

		return -EINVAL;



	if (inst->state == MSM_VIDC_CORE_INVALID ||

		inst->core->state == VIDC_CORE_INVALID)

		return -EINVAL;



	rc = map_and_register_buf(inst, b);