diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-03-01 15:00:40 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-03-01 15:01:16 +0100 |
| commit | 3473b71e21609c9dfb74d0a5a13d6321d3049c05 (patch) | |
| tree | 8012fa7c602a79c9c90303694b7749dcd2f0e136 /drivers/tee/tee_core.c | |
| parent | 4f640201a8aebcee053712828f5457aee9909cc8 (diff) | |
| parent | 32356d309c22a9497e612ed437d66407e15935f3 (diff) | |
Merge tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers
OP-TEE driver
- dual license for optee_msg.h and optee_smc.h
Generic
- add cancellation support to client interface
* tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux-tee:
tee: optee: update optee_msg.h and optee_smc.h to dual license
tee: add cancellation support to client interface
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/tee/tee_core.c')
| -rw-r--r-- | drivers/tee/tee_core.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 06fbfc044ea3..17c64fccbb10 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -1041,6 +1041,15 @@ int tee_client_invoke_func(struct tee_context *ctx, } EXPORT_SYMBOL_GPL(tee_client_invoke_func); +int tee_client_cancel_req(struct tee_context *ctx, + struct tee_ioctl_cancel_arg *arg) +{ + if (!ctx->teedev->desc->ops->cancel_req) + return -EINVAL; + return ctx->teedev->desc->ops->cancel_req(ctx, arg->cancel_id, + arg->session); +} + static int tee_client_device_match(struct device *dev, struct device_driver *drv) { |