summaryrefslogtreecommitdiffstats
path: root/drivers/tee
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2018-08-01 11:48:33 +0200
committerJens Wiklander <jens.wiklander@linaro.org>2018-08-24 11:55:18 +0200
commitdb878f76b9ff7487da9bb0f686153f81829f1230 (patch)
treebb7d90f7e7cf95cb371644964dc1d3219ec74328 /drivers/tee
parent94710cac0ef4ee177a63b5227664b38c95bbf703 (diff)
downloadlinux-0-day-db878f76b9ff7487da9bb0f686153f81829f1230.tar.gz
linux-0-day-db878f76b9ff7487da9bb0f686153f81829f1230.tar.xz
tee: optee: take DT status property into account
DT nodes may have a 'status' property which, if set to anything other than 'ok' or 'okay', indicates to the OS that the DT node should be treated as if it was not present. So add that missing logic to the OP-TEE driver. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'drivers/tee')
-rw-r--r--drivers/tee/optee/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index e5fd5ed217dac..69ea1efbb051d 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);