Merge "msm: vidc: kill unsupported sessions" (6a9faf2e) · Commits · e / devices / android_kernel_sony_msm8994

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

+6 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2015, 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
		@@ -486,8 +486,8 @@ static void change_inst_state(struct msm_vidc_inst *inst,
		mutex_lock(&inst->lock);
		if (inst->state == MSM_VIDC_CORE_INVALID) {
		dprintk(VIDC_DBG,
		"Inst: %p is in bad state can't change state\n",
		inst);
		"Inst: %p is in bad state can't change state to %d\n",
		inst, state);
		goto exit;
		}
		dprintk(VIDC_DBG, "Moved inst: %p from state: %d to state: %d\n",
		@@ -2165,6 +2165,7 @@ core_already_uninited:

		int msm_comm_force_cleanup(struct msm_vidc_inst *inst)
		{
		msm_comm_kill_session(inst);
		return msm_vidc_deinit_core(inst);
		}

		@@ -4150,6 +4151,7 @@ int msm_vidc_check_session_supported(struct msm_vidc_inst *inst)
		rc = msm_vidc_load_supported(inst);
		if (rc) {
		change_inst_state(inst, MSM_VIDC_CORE_INVALID);
		msm_comm_kill_session(inst);
		dprintk(VIDC_WARN,
		"%s: Hardware is overloaded\n", __func__);
		return rc;
		@@ -4195,6 +4197,7 @@ int msm_vidc_check_session_supported(struct msm_vidc_inst *inst)
		}
		if (rc) {
		change_inst_state(inst, MSM_VIDC_CORE_INVALID);
		msm_comm_kill_session(inst);
		dprintk(VIDC_ERR,
		"%s: Resolution unsupported\n", __func__);
		}