1 files changed, 12 insertions, 5 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
index 6d25bfe237..6dbb74c666 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
@@ -1,7 +1,7 @@
 /** @file
   Language settings
 
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -408,24 +408,23 @@ InitializeLangVariable (
   IN BOOLEAN    Iso639Language
   )
 {
-  EFI_STATUS  Status;
   CHAR8       *Lang;
 
   //
   // Find current Lang or PlatformLang from EFI Variable.
   //
-  Status = GetEfiGlobalVariable2 (LangName, (VOID **) &Lang, NULL);
+  GetEfiGlobalVariable2 (LangName, (VOID **) &Lang, NULL);
   //
   // If Lang or PlatformLang variable is not found,
   // or it has been set to an unsupported value(not one of the supported language codes),
   // set the default language code to it.
   //
-  if (EFI_ERROR (Status) || !IsLangInSupportedLangCodes (SupportedLang, Lang, Iso639Language)) {
+  if ((Lang == NULL) || !IsLangInSupportedLangCodes (SupportedLang, Lang, Iso639Language)) {
     //
     // The default language code should be one of the supported language codes.
     //
     ASSERT (IsLangInSupportedLangCodes (SupportedLang, DefaultLang, Iso639Language));
-    Status = gRT->SetVariable (
+    BdsDxeSetVariableAndReportStatusCodeOnError (
                     LangName,
                     &gEfiGlobalVariableGuid,
                     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@@ -471,6 +470,10 @@ InitializeLanguage (
                       AsciiStrSize (LangCodes),
                       LangCodes
                       );
+      //
+      // Platform needs to make sure setting volatile variable before calling 3rd party code shouldn't fail.
+      //
+      ASSERT_EFI_ERROR (Status);
     }
 
     Status = gRT->SetVariable (
@@ -480,6 +483,10 @@ InitializeLanguage (
                     AsciiStrSize (PlatformLangCodes),
                     PlatformLangCodes
                     );
+    //
+    // Platform needs to make sure setting volatile variable before calling 3rd party code shouldn't fail.
+    //
+    ASSERT_EFI_ERROR (Status);
   }
 
   if (!FeaturePcdGet (PcdUefiVariableDefaultLangDeprecate)) {