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>
- Merge continous entries whose type is EfiGcdMemoryTypeMemoryMappedIo.\r
+ Merge continuous entries whose type is EfiGcdMemoryTypeMemoryMappedIo.\r
\r
@param[in, out] GcdMemoryMap A pointer to the buffer in which firmware places\r
the current GCD memory map.\r
\r
@param[in, out] GcdMemoryMap A pointer to the buffer in which firmware places\r
the current GCD memory map.\r
@param[in] Interface Points to the interface instance.\r
@param[in] Handle The handle on which the interface was installed.\r
\r
@param[in] Interface Points to the interface instance.\r
@param[in] Handle The handle on which the interface was installed.\r
\r
- @retval EFI_SUCCESS Notification runs successfully.\r
+ @retval EFI_SUCCESS Notification runs successfully.\r
+ @retval EFI_OUT_OF_RESOURCES No enough resources to save GCD MMIO map.\r
**/\r
EFI_STATUS\r
EFIAPI\r
**/\r
EFI_STATUS\r
EFIAPI\r
MergeGcdMmioEntry (MemSpaceMap, &NumberOfDescriptors);\r
\r
mSmmIoLibGcdMemSpace = AllocateCopyPool (NumberOfDescriptors * sizeof (EFI_GCD_MEMORY_SPACE_DESCRIPTOR), MemSpaceMap);\r
MergeGcdMmioEntry (MemSpaceMap, &NumberOfDescriptors);\r
\r
mSmmIoLibGcdMemSpace = AllocateCopyPool (NumberOfDescriptors * sizeof (EFI_GCD_MEMORY_SPACE_DESCRIPTOR), MemSpaceMap);\r
- ASSERT_EFI_ERROR (Status);\r
- if (EFI_ERROR (Status)) {\r
+ ASSERT (mSmmIoLibGcdMemSpace != NULL);\r
+ if (mSmmIoLibGcdMemSpace == NULL) {\r
gBS->FreePool (MemSpaceMap);\r
gBS->FreePool (MemSpaceMap);\r
+ return EFI_OUT_OF_RESOURCES;\r
}\r
\r
mSmmIoLibGcdMemNumberOfDesc = NumberOfDescriptors;\r
}\r
\r
mSmmIoLibGcdMemNumberOfDesc = NumberOfDescriptors;\r