diff --git a/security/optee_linuxdriver/core/tee_kernel_api.c b/security/optee_linuxdriver/core/tee_kernel_api.c
index 3b4380faf3b1..41568c8e9ec0 100644
--- a/security/optee_linuxdriver/core/tee_kernel_api.c
+++ b/security/optee_linuxdriver/core/tee_kernel_api.c
@@ -81,8 +81,7 @@ void TEEC_FinalizeContext(TEEC_Context *context)
 {
 	if (!context || !context->fd) {
 		pr_err("%s - can't release context %p:[%s]\n", __func__,
-		       context, (context
-				 && context->devname) ? context->devname : "");
+		       context, context ? context->devname : "");
 		return;
 	}
 	/* TODO fixme will not work on 64-bit platform */
diff --git a/security/optee_linuxdriver/core/tee_session.c b/security/optee_linuxdriver/core/tee_session.c
index 501e89f5c276..32ffb07a131d 100644
--- a/security/optee_linuxdriver/core/tee_session.c
+++ b/security/optee_linuxdriver/core/tee_session.c
@@ -680,7 +680,6 @@ static void _update_client_tee_cmd(struct tee_session *sess,
 
 	BUG_ON(!cmd_io);
 	BUG_ON(!cmd_io->op);
-	BUG_ON(!cmd_io->op->params);
 	BUG_ON(!cmd);
 	BUG_ON(!sess->ctx);
 	ctx = sess->ctx;