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

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

Merge "msm: vidc: Add state check to allow flush command"

parents 1237cd34 57004b5b

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

+1 −1
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ void msm_clock_data_reset(struct msm_vidc_inst *inst) 


	dprintk(VIDC_DBG, "Init DCVS Load\n");



	if (!inst || !inst->core) {

	if (!inst || !inst->core || !inst->clk_data.entry) {

		dprintk(VIDC_ERR, "%s Invalid args: Inst = %pK\n",

			__func__, inst);

		return;

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

+8 −0
Original line number Diff line number Diff line
@@ -5272,6 +5272,14 @@ int msm_comm_flush(struct msm_vidc_inst *inst, u32 flags) 
				"Invalid params, inst %pK\n", inst);

		return -EINVAL;

	}



	if (inst->state < MSM_VIDC_OPEN_DONE) {

		dprintk(VIDC_ERR,

			"Invalid state to call flush, inst %pK, state %#x\n",

			inst, inst->state);

		return -EINVAL;

	}



	core = inst->core;

	hdev = core->device;