X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FBus%2FUsb%2FUsbKbDxe%2FKeyBoard.c;h=b608f65367a17bb9616ddb1eac8eda8cda0f0c2e;hp=d2bac53a529503284bf8b95095a5d22cd0624c06;hb=676df92c2c0c5bdeb0f8e27349f5dd467928ce09;hpb=bb1d8ee66943c3d126abbfc007159eb0fe458927

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);
   }
 }