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

Commit 7c3014c3 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: Add NULL check for vb buffers"

parents 8af14aca 5b9cc7f6

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

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static inline int get_bufs_outside_fw(struct msm_vidc_inst *inst) 
			q = &inst->bufq[CAPTURE_PORT].vb2_bufq;

			for (i = 0; i < q->num_buffers; i++) {

				vb = q->bufs[i];

				if (vb->state != VB2_BUF_STATE_ACTIVE &&

				if (vb && vb->state != VB2_BUF_STATE_ACTIVE &&

						vb->planes[0].bytesused)

					fw_out_qsize++;

			}
@@ -315,7 +315,7 @@ static inline int get_bufs_outside_fw(struct msm_vidc_inst *inst) 
			q = &inst->bufq[OUTPUT_PORT].vb2_bufq;

			for (i = 0; i < q->num_buffers; i++) {

				vb = q->bufs[i];

				if (vb->state != VB2_BUF_STATE_ACTIVE)

				if (vb && vb->state != VB2_BUF_STATE_ACTIVE)

					fw_out_qsize++;

			}

		}