Remove the auto conversion for the first varstore name to "Setup".

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiOnUefiHiiThunk / ConfigAccess.c

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
index 3efda6703a7b223d7cf7f437270be29727840e18..a96ca84272536deb8a17698b594a98510396ef62 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
@@ -343,11 +343,11 @@ CallFormCallBack (
     }\r
 \r
     *Data = AllocateZeroPool (*DataSize);\r
-    if (Data == NULL) {\r
+    if (*Data == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    FwFormCallBack->NvRead (\r
+    Status = FwFormCallBack->NvRead (\r
                   FwFormCallBack,  \r
                   BufferStorage->Name,\r
                   &BufferStorage->Guid,\r
@@ -403,7 +403,7 @@ GetUefiVariable (
     }\r
 \r
     *Data = AllocateZeroPool (*DataSize);\r
-    if (Data == NULL) {\r
+    if (*Data == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -611,7 +611,7 @@ ThunkRouteConfig (
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
-\r
+  \r
   if (ConfigAccess->ThunkContext->NvMapOverride == NULL) {\r
     if (ConfigAccess->FormCallbackProtocol == NULL ||\r
         ConfigAccess->FormCallbackProtocol->NvWrite == NULL) {\r