diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index 41aec7647b2b..081694c8a1c2 100644
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -511,10 +511,11 @@ gb_operation_create_incoming(struct gb_connection *connection, u16 id,
 
 	operation = gb_operation_create_common(connection, type,
 					request_size, 0, flags, GFP_ATOMIC);
-	if (operation) {
-		operation->id = id;
-		memcpy(operation->request->header, data, size);
-	}
+	if (!operation)
+		return NULL;
+
+	operation->id = id;
+	memcpy(operation->request->header, data, size);
 
 	return operation;
 }