Merge tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux...

[linux.git] / drivers / tee / tee_core.c

diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index ecffdd8a29b71e474a5ea35702a88062e565aa35..17c64fccbb10f3fde59114dde5ae4d2c73ece664 100644 (file)
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -993,7 +993,9 @@ tee_client_open_context(struct tee_context *start,
         * tee_client_open_session() if any in kernel client requires
         * different behaviour.
         */
-       ctx->supp_nowait = true;
+       if (!IS_ERR(ctx))
+               ctx->supp_nowait = true;
+
        return ctx;
 }
 EXPORT_SYMBOL_GPL(tee_client_open_context);