Update for IntelFrameworkModulePkg.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / BootMaint / Variable.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index c055537e37ee4ebf610931d0b2472b98e572484f..c4b83ba0ffa4476d6c2d17a09e9fdb2d45cd9a31 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -673,14 +673,13 @@ Var_UpdateDriverOption (
                       &gEfiGlobalVariableGuid,\r
                       &DriverOrderListSize\r
                       );\r
-  ASSERT (DriverOrderList != NULL);\r
   NewDriverOrderList = AllocateZeroPool (DriverOrderListSize + sizeof (UINT16));\r
   ASSERT (NewDriverOrderList != NULL);\r
-  CopyMem (NewDriverOrderList, DriverOrderList, DriverOrderListSize);\r
-  NewDriverOrderList[DriverOrderListSize / sizeof (UINT16)] = Index;\r
   if (DriverOrderList != NULL) {\r
+    CopyMem (NewDriverOrderList, DriverOrderList, DriverOrderListSize);\r
     EfiLibDeleteVariable (L"DriverOrder", &gEfiGlobalVariableGuid);\r
   }\r
+  NewDriverOrderList[DriverOrderListSize / sizeof (UINT16)] = Index;\r
 \r
   Status = gRT->SetVariable (\r
                   L"DriverOrder",\r
@@ -1345,8 +1344,8 @@ Var_UpdateConMode (
 \r
   Status = gST->ConOut->QueryMode (gST->ConOut, Mode, &(ModeInfo.Column), &(ModeInfo.Row));\r
   if (!EFI_ERROR(Status)) {\r
-    PcdSet32 (PcdConOutColumn, (UINT32) ModeInfo.Column);\r
-    PcdSet32 (PcdConOutRow, (UINT32) ModeInfo.Row);\r
+    PcdSet32 (PcdSetupConOutColumn, (UINT32) ModeInfo.Column);\r
+    PcdSet32 (PcdSetupConOutRow, (UINT32) ModeInfo.Row);\r
   }\r
 \r
   return EFI_SUCCESS;\r