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 335a9b9bc71fbf8338851b05b89ef72ae5c00938..ce4efffbd73626b1734b0db707605d85b5343668 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c
@@ -102,20 +102,18 @@ RuntimeDriverLibConstruct (
   //\r
   // Register SetVirtualAddressMap () notify function\r
   // \r
-  if (_gDriverSetVirtualAddressMapEvent[0] != NULL) {\r
-    ASSERT (gBS != NULL);\r
-    Status = gBS->CreateEvent (\r
-                    EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
-                    EFI_TPL_NOTIFY,\r
-                    RuntimeLibVirtualNotifyEvent,\r
-                    NULL,\r
-                    &mEfiVirtualNotifyEvent\r
-                    );\r
-\r
-    ASSERT_EFI_ERROR (Status);\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
+  ASSERT (gBS != NULL);\r
+  Status = gBS->CreateEvent (\r
+                  EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
+                  EFI_TPL_NOTIFY,\r
+                  RuntimeLibVirtualNotifyEvent,\r
+                  NULL,\r
+                  &mEfiVirtualNotifyEvent\r
+                  );\r
+\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -138,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