X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FBus%2FUsb%2FUsbKbDxe%2FKeyBoard.c;h=32ea3cfb8a4af858f5c7eea3678b91c5393c1279;hp=7a8ee00d3c69bb083ff149e1d3c9ef3952ca2e65;hb=cb7d01c0c9fd199742d0fed6aa69dab0c79c3338;hpb=169a34619b6d583d9f2934a6a3e9caf6e5c6e355

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index 7a8ee00d3c..32ea3cfb8a 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -318,7 +318,6 @@ InstallDefaultKeyboardLayout (
   EFI_STATUS                   Status;
   EFI_HII_DATABASE_PROTOCOL    *HiiDatabase;
   EFI_HII_HANDLE               HiiHandle;
-  EFI_HII_PACKAGE_LIST_HEADER  *PackageList;
 
   //
   // Locate Hii database protocol
@@ -335,13 +334,14 @@ InstallDefaultKeyboardLayout (
   //
   // Install Keyboard Layout package to HII database
   //
-  PackageList = HiiLibPreparePackageList (1, &mUsbKeyboardLayoutPackageGuid, &mUsbKeyboardLayoutBin);
-  ASSERT (PackageList != NULL);
-
-  Status = HiiDatabase->NewPackageList (HiiDatabase, PackageList, UsbKeyboardDevice->ControllerHandle, &HiiHandle);
-  FreePool (PackageList);
-  if (EFI_ERROR (Status)) {
-    return Status;
+  HiiHandle = HiiAddPackages (
+                &mUsbKeyboardLayoutPackageGuid,
+                UsbKeyboardDevice->ControllerHandle,
+                &mUsbKeyboardLayoutBin,
+                NULL
+                );
+  if (HiiHandle == NULL) {
+    return EFI_OUT_OF_RESOURCES;
   }
 
   //