Merge "qseecom: Update the error val check" (dc21f686) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/misc/qseecom.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -704,7 +704,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id,
		qseecom.smcinvoke_support = true;
		smc_id = TZ_OS_REGISTER_LISTENER_SMCINVOKE_ID;
		ret = __qseecom_scm_call2_locked(smc_id, &desc);
		if (ret == -EIO) {
		if (ret == -EOPNOTSUPP) {
		/* smcinvoke is not supported */
		qseecom.smcinvoke_support = false;
		smc_id = TZ_OS_REGISTER_LISTENER_ID;

+3 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		/*
		* QTI TEE shared memory bridge driver
		*
		* Copyright (c) 2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2021, The Linux Foundation. All rights reserved.
		*/

		#include <linux/module.h>
		@@ -128,7 +128,8 @@ static int32_t qtee_shmbridge_enable(bool enable)
		if (ret \|\| desc.ret[0]) {
		pr_err("Failed to enable shmbridge, rsp = %lld, ret = %d\n",
		desc.ret[0], ret);
		if (ret == -EIO \|\| desc.ret[0] == SHMBRIDGE_E_NOT_SUPPORTED)
		if (ret == -EOPNOTSUPP \|\|
		desc.ret[0] == SHMBRIDGE_E_NOT_SUPPORTED)
		pr_warn("shmbridge is not supported by this target\n");
		return ret \| desc.ret[0];
		}