Commit 7c79f736 authored by Dan Carpenter's avatar Dan Carpenter Committed by Yingbao Jia
Browse files

platform/x86: ISST: unlock on error path in tpmi_sst_init() 

mainline inclusion
from mainline-v6.4-rc1
commit 710ddfbf
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I8WOEO

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=710ddfbfda939b84794fa3912047bbc6754cbddc



-------------------------------------

Call mutex_unlock(&isst_tpmi_dev_lock) before returning on this
error path.

Intel-SIG: commit 710ddfbf platform/x86: ISST: unlock on error path in tpmi_sst_init().
Backport Intel speed select ISST driver support on TPMI.

Fixes: d805456c ("platform/x86: ISST: Enumerate TPMI SST and create framework")
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://lore.kernel.org/r/dcdebbb7-7de6-4d04-8e7a-43d5ca043484@kili.mountain


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 53793d15

drivers/platform/x86/intel_speed_select_if/isst_tpmi_core.c

+4 −2
Original line number Diff line number Diff line
@@ -1399,8 +1399,10 @@ int tpmi_sst_init(void) 
	isst_common.sst_inst = kcalloc(topology_max_packages(),

				       sizeof(*isst_common.sst_inst),

				       GFP_KERNEL);

	if (!isst_common.sst_inst)

		return -ENOMEM;

	if (!isst_common.sst_inst) {

		ret = -ENOMEM;

		goto init_done;

	}



	memset(&cb, 0, sizeof(cb));

	cb.cmd_size = sizeof(struct isst_if_io_reg);