diff options
| author | Olof Johansson <olof@lixom.net> | 2018-08-26 16:27:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-08-26 16:27:32 -0700 |
| commit | 63c65b872562a2faf8a3a289c117d0c0e3bceb5a (patch) | |
| tree | e455b65cfbf1ea60ffbd792ac644d742aea23961 /drivers/tee/optee | |
| parent | 5b394b2ddf0347bef56e50c69a58773c94343ff3 (diff) | |
| parent | 25559c22cef879c5cf7119540bfe21fb379d29f3 (diff) | |
Merge tag 'tee-drv-for-4.20' of git://git.linaro.org/people/jens.wiklander/linux-tee into next/drivers
Misc enhancement for tee driver subsystem
* Adds a kernel internal tee client interface allowing other drivers
etc to access a TEE
* OP-TEE driver takes DT status property into account
* tag 'tee-drv-for-4.20' of git://git.linaro.org/people/jens.wiklander/linux-tee:
tee: add kernel internal client interface
tee: optee: take DT status property into account
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/tee/optee')
| -rw-r--r-- | drivers/tee/optee/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index e1aafe842d66..34dce850067b 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -696,7 +696,7 @@ static int __init optee_driver_init(void) return -ENODEV; np = of_find_matching_node(fw_np, optee_match); - if (!np) + if (!np || !of_device_is_available(np)) return -ENODEV; optee = optee_probe(np); |