Merge tag 'tee-drv-for-4.20' of git://git.linaro.org/people/jens.wiklander/linux...

[sfrench/cifs-2.6.git] / drivers / tee / optee / core.c

diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index e1aafe842d660bb11b1146133105f37bff24873e..34dce850067b9e9c379274ef8b3c91da4bb42ef0 100644 (file)
--- 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);