diff options
| author | Eric Dong <eric.dong@intel.com> | 2016-04-06 12:54:11 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2016-07-04 10:33:38 +0800 |
| commit | 5d205283c263dfece2ebc3c9bc92e8ad45826513 (patch) | |
| tree | db4b0ed888dd42b9c98909990533fac30a7d2479 /SecurityPkg | |
| parent | f91689dd260c1c5bdca55ee838801e45ae474393 (diff) | |
| download | edk2-platforms-5d205283c263dfece2ebc3c9bc92e8ad45826513.tar.xz | |
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>
(cherry picked from commit 59ed6433dd84798da6a17366700b057218c04a3a)
Diffstat (limited to 'SecurityPkg')
| -rw-r--r-- | SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c | 2 | ||||
| -rw-r--r-- | SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c index 234909b13b..2db5ffeba9 100644 --- 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. **/
-#include <uefi.h>
+#include <Uefi.h>
#include <Library/BaseLib.h>
#include <Library/TimerLib.h>
#include <Library/BaseMemoryLib.h>
diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c index 2d3ecb474c..d27a9c9b5f 100644 --- 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.
**/
-#include <uefi.h>
+#include <Uefi.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/TcgStorageOpalLib.h>
@@ -853,8 +853,9 @@ OpalUtilDetermineOwnership( TCG_RESULT Ret;
OPAL_OWNER_SHIP Owner;
- NULL_CHECK(Session);
- NULL_CHECK(Msid);
+ if ((Session == NULL) || (Msid == NULL)) {
+ return OpalOwnershipUnknown;
+ }
Owner = OpalOwnershipUnknown;
//
|