Unverified Commit 95ff410d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'optee-for-v7.1' of... 

Merge tag 'optee-for-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into soc/drivers

OP-TEE update for 7.1

Simplify TEE implementor ID match logic

* tag 'optee-for-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee

:
  optee: simplify OP-TEE context match

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d752790a 8c6e843f

drivers/tee/optee/device.c

+1 −4
Original line number Diff line number Diff line
@@ -13,10 +13,7 @@ 


static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)

{

	if (ver->impl_id == TEE_IMPL_ID_OPTEE)

		return 1;

	else

		return 0;

	return (ver->impl_id == TEE_IMPL_ID_OPTEE);

}



static int get_devices(struct tee_context *ctx, u32 session,