Fix VS2005 build error

[mirror_edk2.git] / MdeModulePkg / Universal / FirmwareVolume / FaultTolerantWriteDxe / FtwLite.c

diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c
index 76e3cb3b8fa5b06becd73553db2216dd01a23e14..9a999c900e3a9b2fe749836360950b94d75aa783 100644 (file)
--- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c
+++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c
@@ -622,13 +622,7 @@ InitializeFtwLite (
 \r
   FtwLiteDevice = NULL;\r
   FtwLiteDevice = AllocatePool (sizeof (EFI_FTW_LITE_DEVICE) + Length);\r
-  if (FtwLiteDevice != NULL) {\r
-    Status = EFI_SUCCESS;\r
-  } else {\r
-    Status = EFI_OUT_OF_RESOURCES;\r
-  }\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
+  ASSERT (FtwLiteDevice != NULL);\r
 \r
   ZeroMem (FtwLiteDevice, sizeof (EFI_FTW_LITE_DEVICE));\r
   FtwLiteDevice->Signature = FTW_LITE_DEVICE_SIGNATURE;\r
@@ -791,7 +785,8 @@ InitializeFtwLite (
       (FtwLiteDevice->FtwSpareLba == (EFI_LBA) (-1))\r
       ) {\r
     DEBUG ((EFI_D_ERROR, "FtwLite: Working or spare FVB not ready\n"));\r
-    ASSERT_EFI_ERROR (Status);\r
+    FreePool (FtwLiteDevice);\r
+    return EFI_ABORTED;\r
   }\r
   //\r
   // Refresh workspace data from working block\r
@@ -831,6 +826,7 @@ InitializeFtwLite (
       //\r
       Status = WorkSpaceRefresh (FtwLiteDevice);\r
       if (EFI_ERROR (Status)) {\r
+        FreePool (FtwLiteDevice);\r
         return EFI_ABORTED;\r
       }\r
     } else {\r
@@ -850,6 +846,7 @@ InitializeFtwLite (
       Status = FtwReclaimWorkSpace (FtwLiteDevice, FALSE);\r
 \r
       if (EFI_ERROR (Status)) {\r
+        FreePool (FtwLiteDevice);\r
         return EFI_ABORTED;\r
       }\r
     }\r
@@ -869,6 +866,7 @@ InitializeFtwLite (
                   &FtwLiteDevice->FtwLiteInstance\r
                   );\r
   if (EFI_ERROR (Status)) {\r
+    FreePool (FtwLiteDevice);\r
     return EFI_ABORTED;\r
   }\r
   //\r
@@ -912,6 +910,7 @@ InitializeFtwLite (
     Status = FtwReclaimWorkSpace (FtwLiteDevice, TRUE);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_FTW_LITE, "FtwLite: Workspace reclaim - %r\n", Status));\r
+      FreePool (FtwLiteDevice);\r
       return EFI_ABORTED;\r
     }\r
   }\r