Merge "msm: vidc: Add state check to allow flush command" (037ce17c) · Commits · e / devices / android_kernel_fairphone_FP3

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -971,7 +971,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;

+9 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -5231,6 +5231,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;