summaryrefslogtreecommitdiffstats
path: root/MdePkg/Library/SmmIoLib
diff options
context:
space:
mode:
authorStar Zeng <star.zeng@intel.com>2017-06-05 14:31:19 +0800
committerStar Zeng <star.zeng@intel.com>2017-06-06 09:07:10 +0800
commit7b5d848dbfc3abe8b8c6066168bf10eca39d5891 (patch)
tree7664a291c20b7b84d6c179b62d6f6f1a12b32812 /MdePkg/Library/SmmIoLib
parent1a0ad70ee190210084f1453b309f7c2035a8b0b3 (diff)
downloadedk2-7b5d848dbfc3abe8b8c6066168bf10eca39d5891.tar.gz
edk2-7b5d848dbfc3abe8b8c6066168bf10eca39d5891.tar.bz2
edk2-7b5d848dbfc3abe8b8c6066168bf10eca39d5891.zip
MdePkg SmmIoLib: Use NULL pointer check instead of useless Status check
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=587 The Status check in "if (!EFI_ERROR (Status))" condition is useless, it should be NULL pointer check. And this patch also fixes a typo "continous" to "continuous". Cc: Jiewen Yao <jiewen.yao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <star.zeng@intel.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Diffstat (limited to 'MdePkg/Library/SmmIoLib')
-rw-r--r--MdePkg/Library/SmmIoLib/SmmIoLib.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/MdePkg/Library/SmmIoLib/SmmIoLib.c b/MdePkg/Library/SmmIoLib/SmmIoLib.c
index 181abb8e25..f1cb0dace5 100644
--- a/MdePkg/Library/SmmIoLib/SmmIoLib.c
+++ b/MdePkg/Library/SmmIoLib/SmmIoLib.c
@@ -156,7 +156,7 @@ SmmIsMmioValid (
}
/**
- Merge continous entries whose type is EfiGcdMemoryTypeMemoryMappedIo.
+ Merge continuous entries whose type is EfiGcdMemoryTypeMemoryMappedIo.
@param[in, out] GcdMemoryMap A pointer to the buffer in which firmware places
the current GCD memory map.
@@ -217,7 +217,8 @@ MergeGcdMmioEntry (
@param[in] Interface Points to the interface instance.
@param[in] Handle The handle on which the interface was installed.
- @retval EFI_SUCCESS Notification runs successfully.
+ @retval EFI_SUCCESS Notification runs successfully.
+ @retval EFI_OUT_OF_RESOURCES No enough resources to save GCD MMIO map.
**/
EFI_STATUS
EFIAPI
@@ -237,10 +238,10 @@ SmmIoLibInternalEndOfDxeNotify (
MergeGcdMmioEntry (MemSpaceMap, &NumberOfDescriptors);
mSmmIoLibGcdMemSpace = AllocateCopyPool (NumberOfDescriptors * sizeof (EFI_GCD_MEMORY_SPACE_DESCRIPTOR), MemSpaceMap);
- ASSERT_EFI_ERROR (Status);
- if (EFI_ERROR (Status)) {
+ ASSERT (mSmmIoLibGcdMemSpace != NULL);
+ if (mSmmIoLibGcdMemSpace == NULL) {
gBS->FreePool (MemSpaceMap);
- return Status;
+ return EFI_OUT_OF_RESOURCES;
}
mSmmIoLibGcdMemNumberOfDesc = NumberOfDescriptors;