WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
\r
**/\r
-#include <uefi.h>\r
+#include <Uefi.h>\r
#include <Library/BaseLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/TcgStorageOpalLib.h>\r
// Try to revert with admin1\r
//\r
Ret = OpalAdminRevert(Session, KeepUserData, &MethodStatus);\r
- if (Ret != TcgResultSuccess || MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS) {\r
+ if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) {\r
//\r
// Device ends the session on successful revert, so only call OpalEndSession when fail.\r
//\r
TCG_RESULT Ret;\r
OPAL_OWNER_SHIP Owner;\r
\r
- NULL_CHECK(Session);\r
- NULL_CHECK(Msid);\r
+ if ((Session == NULL) || (Msid == NULL)) {\r
+ return OpalOwnershipUnknown;\r
+ }\r
\r
Owner = OpalOwnershipUnknown;\r
//\r