Fix the bug that destructor should sync with constructor

[mirror_edk2.git] / EdkModulePkg / Library / EdkUefiRuntimeLib / Common / RuntimeLib.c

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
index 32eaed74a2408bf71fc2c6ef09969d79bed0b212..ce4efffbd73626b1734b0db707605d85b5343668 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
@@ -113,7 +113,7 @@ RuntimeDriverLibConstruct (
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return EFI_SUCCESS;\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -136,13 +136,11 @@ RuntimeDriverLibDeconstruct (
   //\r
   // Close SetVirtualAddressMap () notify function\r
   //\r
-  if (_gDriverSetVirtualAddressMapEvent[0] != NULL) {\r
-    ASSERT (gBS != NULL);\r
-    Status = gBS->CloseEvent (mEfiVirtualNotifyEvent);\r
-    ASSERT_EFI_ERROR (Status);\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
+  ASSERT (gBS != NULL);\r
+  Status = gBS->CloseEvent (mEfiVirtualNotifyEvent);\r
+  ASSERT_EFI_ERROR (Status);\r
+  \r
+  return Status;\r
 }\r
 \r
 /**\r