1 files changed, 5 insertions, 3 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index d2bac53a52..b608f65367 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -651,7 +651,9 @@ ReleaseKeyboardLayoutResources (
   USB_NS_KEY      *UsbNsKey;
   LIST_ENTRY      *Link;
 
-  SafeFreePool (UsbKeyboardDevice->KeyConvertionTable);
+  if (UsbKeyboardDevice->KeyConvertionTable != NULL) {
+    FreePool (UsbKeyboardDevice->KeyConvertionTable);
+  }
   UsbKeyboardDevice->KeyConvertionTable = NULL;
 
   while (!IsListEmpty (&UsbKeyboardDevice->NsKeyList)) {
@@ -659,8 +661,8 @@ ReleaseKeyboardLayoutResources (
     UsbNsKey = USB_NS_KEY_FORM_FROM_LINK (Link);
     RemoveEntryList (&UsbNsKey->Link);
 
-    gBS->FreePool (UsbNsKey->NsKey);
-    gBS->FreePool (UsbNsKey);
+    FreePool (UsbNsKey->NsKey);
+    FreePool (UsbNsKey);
   }
 }