| From 33acf957a46e538b0dd5bfa2d87852bc9450ffb1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 1 Aug 2018 11:48:33 +0200 |
| Subject: tee: optee: take DT status property into account |
| |
| From: Ard Biesheuvel <ard.biesheuvel@linaro.org> |
| |
| [ Upstream commit db878f76b9ff7487da9bb0f686153f81829f1230 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/tee/optee/core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c |
| index e1aafe842d660..34dce850067b9 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); |
| -- |
| 2.20.1 |
| |
