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

Commit 043b53f2 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Correct conditional check"

parents 78372151 dc0c2baa

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

+7 −5
Original line number Diff line number Diff line
@@ -4188,15 +4188,16 @@ int msm_comm_qbuf_decode_batch(struct msm_vidc_inst *inst, 
	mutex_lock(&inst->registeredbufs.lock);

	list_for_each_entry(buf, &inst->registeredbufs.list, list) {

		/* Don't queue if buffer is not CAPTURE_MPLANE */

		if (!(buf->vvb.vb2_buf.type &

			V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE))

			continue;

		if (buf->vvb.vb2_buf.type !=

			V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)

			goto loop_end;

		/* Don't queue if buffer is not a deferred buffer */

		if (!(buf->flags & MSM_VIDC_FLAG_DEFERRED))

			continue;

			goto loop_end;

		/* Don't queue if RBR event is pending on this buffer */

		if (buf->flags & MSM_VIDC_FLAG_RBR_PENDING)

			continue;

			goto loop_end;



		print_vidc_buffer(VIDC_DBG, "batch-qbuf", inst, buf);

		rc = msm_comm_qbuf_to_hfi(inst, buf);

		if (rc) {
@@ -4204,6 +4205,7 @@ int msm_comm_qbuf_decode_batch(struct msm_vidc_inst *inst, 
				__func__, rc);

			break;

		}

loop_end:

		/* Queue pending buffers till the current buffer only */

		if (buf == mbuf)

			break;