SecurityPkg TcgStorageOpalLib: Fixed gcc build failure.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
index 234909b13b095bc19ac1b9de48f70a784e91e41c..2db5ffeba9c86b33f0eb735965a28f703ecb2cc9 100644 (file)
--- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
+++ b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
@@ -12,7 +12,7 @@ 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/TimerLib.h>\r
 #include <Library/BaseMemoryLib.h>\r

diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
index 2d3ecb474cfac4f7e5cfe73915c88d2b64f3f614..d27a9c9b5f8fe5e86e901ff4a65e9ec0d151f203 100644 (file)
--- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
+++ b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
@@ -11,7 +11,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 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
@@ -853,8 +853,9 @@ OpalUtilDetermineOwnership(
   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