Fixed potential issues to release resources when error occurs.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4341 6f19259b-4bc3-4df7-8a09-765794883524

MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c

@@ -1496,6 +1496,7 @@ EhcDriverBindingStart (
   EFI_PCI_IO_PROTOCOL     *PciIo;
   UINT64                  Supports;
   UINT64                  OriginalPciAttributes;
+  BOOLEAN                 PciAttributesSaved;
 
   //
   // Open the PciIo Protocol, then enable the USB host controller
@@ -1514,6 +1515,7 @@ EhcDriverBindingStart (
     return EFI_DEVICE_ERROR;
   }
 
+  PciAttributesSaved = FALSE;
   //
   // Save original PCI attributes
   //
@@ -1525,8 +1527,9 @@ EhcDriverBindingStart (
                     );
 
   if (EFI_ERROR (Status)) {
-    return Status;
+    goto CLOSE_PCIIO;
   }
+  PciAttributesSaved = TRUE;
 
   Status = PciIo->Attributes (
                     PciIo,
@@ -1634,6 +1637,7 @@ FREE_POOL:
   gBS->FreePool (Ehc);
 
 CLOSE_PCIIO:
+  if (PciAttributesSaved == TRUE) {
     //
     // Restore original PCI attributes
     //
@@ -1643,6 +1647,7 @@ CLOSE_PCIIO:
                     OriginalPciAttributes,
                     NULL
                     );
+  }
 
   gBS->CloseProtocol (
          Controller,

MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c

@@ -2133,6 +2133,7 @@ UhciDriverBindingStart (
   USB_HC_DEV          *Uhc;
   UINT64              Supports;
   UINT64              OriginalPciAttributes;
+  BOOLEAN             PciAttributesSaved;
 
   //
   // Open PCIIO, then enable the EHC device and turn off emulation
@@ -2151,6 +2152,7 @@ UhciDriverBindingStart (
     return Status;
   }
 
+  PciAttributesSaved = FALSE;
   //
   // Save original PCI attributes
   //
@@ -2162,8 +2164,9 @@ UhciDriverBindingStart (
                     );
 
   if (EFI_ERROR (Status)) {
-    return Status;
+    goto CLOSE_PCIIO;
   }
+  PciAttributesSaved = TRUE;
 
   UhciTurnOffUsbEmulation (PciIo);
 
@@ -2262,6 +2265,7 @@ FREE_UHC:
   UhciFreeDev (Uhc);
 
 CLOSE_PCIIO:
+  if (PciAttributesSaved == TRUE) {
     //
     // Restore original PCI attributes
     //
@@ -2271,6 +2275,7 @@ CLOSE_PCIIO:
                     OriginalPciAttributes,
                     NULL
                     );
+  }
 
   gBS->CloseProtocol (
         Controller,

MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Init.c

@@ -287,6 +287,7 @@ Returns:
   EFI_PCI_IO_PROTOCOL       *PciIoFncs;
   UINTN                     Len;
   UINT64                    Supports;
+  BOOLEAN                   PciAttributesSaved;
 
   Status = gBS->OpenProtocol (
                   Controller,
@@ -321,6 +322,8 @@ Returns:
     return Status;
   }
 
+  PciAttributesSaved = FALSE;
+
   Status = gBS->AllocatePool (
                   EfiRuntimeServicesData,
                   sizeof (UNDI32_DEV),
@@ -344,8 +347,9 @@ Returns:
                     );
 
   if (EFI_ERROR (Status)) {
-    return Status;
+    goto UndiErrorDeleteDevice;
   }
+  PciAttributesSaved = TRUE;
 
   //
   // allocate and initialize both (old and new) the !pxe structures here,
@@ -550,6 +554,7 @@ UndiErrorDeletePxe:
   }
 
 UndiErrorDeleteDevice:
+  if (PciAttributesSaved == TRUE) {
     //
     // Restore original PCI attributes
     //
@@ -559,6 +564,7 @@ UndiErrorDeleteDevice:
                     UNDI32Device->NicInfo.OriginalPciAttributes,
                     NULL
                     );
+  }
 
   gBS->FreePool (UNDI32Device);
 

OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c

@@ -206,6 +206,7 @@ Returns:
   EFI_PCI_IO_PROTOCOL *PciIo;
   UINT64              Supports;
   UINT64              OriginalPciAttributes;
+  BOOLEAN             PciAttributesSaved;
 
   PciIo = NULL;
   Status = gBS->OpenProtocol (
@@ -220,6 +221,7 @@ Returns:
     return Status;
   }
 
+  PciAttributesSaved = FALSE;
   //
   // Save original PCI attributes
   //
@@ -231,8 +233,9 @@ Returns:
                     );
 
   if (EFI_ERROR (Status)) {
-    return Status;
+    goto Done;
   }
+  PciAttributesSaved = TRUE;
 
   Status = PciIo->Attributes (
                     PciIo,
@@ -262,6 +265,7 @@ Returns:
 
 Done:
   if (EFI_ERROR (Status)) {
+    if (PciAttributesSaved == TRUE) {
       //
       // Restore original PCI attributes
       //
@@ -271,6 +275,7 @@ Done:
                       OriginalPciAttributes,
                       NULL
                       );
+    }
 
     gBS->CloseProtocol (
            Controller,

OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c

@@ -211,7 +211,9 @@ CirrusLogic5430ControllerDriverStart (
 {
   EFI_STATUS                      Status;
   CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private;
+  BOOLEAN                         PciAttributesSaved;
 
+  PciAttributesSaved = FALSE;
   //
   // Allocate Private context data for UGA Draw inteface.
   //
@@ -255,6 +257,7 @@ CirrusLogic5430ControllerDriverStart (
   if (EFI_ERROR (Status)) {
     goto Error;
   }
+  PciAttributesSaved = TRUE;
 
   Status = Private->PciIo->Attributes (
                             Private->PciIo,
@@ -319,6 +322,7 @@ Error:
   if (EFI_ERROR (Status)) {
     if (Private) {
       if (Private->PciIo) {
+        if (PciAttributesSaved == TRUE) {
           //
           // Restore original PCI attributes
           //
@@ -328,7 +332,7 @@ Error:
                           Private->OriginalPciAttributes,
                           NULL
                           );
-
+        }
         //
         // Close the PCI I/O Protocol
         //