From 1068a653744748b71deea1fe4b09e99d4ebe67e8 Mon Sep 17 00:00:00 2001
From: jji4 <jji4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 3 Feb 2009 06:11:04 +0000
Subject: Code size optimized

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7415 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'MdeModulePkg/Bus')

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 654e5c0..f428214 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -1001,10 +1001,6 @@ ScsiScanCreateDevice (
                                           ScsiIoDevice->Lun,
                                           &ScsiDevicePath
                                           );
-    if (Status == EFI_OUT_OF_RESOURCES) {
-      FreePool (ScsiIoDevice);
-      return Status;
-    }
   } else {
     Status = ScsiIoDevice->ScsiPassThru->BuildDevicePath (
                                           ScsiIoDevice->ScsiPassThru,
@@ -1012,10 +1008,11 @@ ScsiScanCreateDevice (
                                           ScsiIoDevice->Lun,
                                           &ScsiDevicePath
                                           );
-    if (Status == EFI_OUT_OF_RESOURCES) {
-      FreePool (ScsiIoDevice);
-      return Status;
-    }
+  }
+
+  if (Status == EFI_OUT_OF_RESOURCES) {
+    FreePool (ScsiIoDevice);
+    return Status;
   }
 
   ScsiIoDevice->DevicePath = AppendDevicePathNode (
@@ -1043,6 +1040,7 @@ ScsiScanCreateDevice (
                   NULL
                   );
   if (EFI_ERROR (Status)) {
+    FreePool (ScsiIoDevice->DevicePath);
     FreePool (ScsiIoDevice);
     return EFI_OUT_OF_RESOURCES;
   } else {
-- 
cgit v1.1