From 6a6d955c5f670141344c614c65dbea332f393b57 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Wed, 28 Nov 2007 03:55:36 +0000 Subject: 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 | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'MdeModulePkg/Bus/Pci/EhciDxe') diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c index 32ae6b6cdc..e37cf719d7 100644 --- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c +++ b/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,15 +1637,17 @@ FREE_POOL: gBS->FreePool (Ehc); CLOSE_PCIIO: - // - // Restore original PCI attributes - // - PciIo->Attributes ( - PciIo, - EfiPciIoAttributeOperationSet, - OriginalPciAttributes, - NULL - ); + if (PciAttributesSaved == TRUE) { + // + // Restore original PCI attributes + // + PciIo->Attributes ( + PciIo, + EfiPciIoAttributeOperationSet, + OriginalPciAttributes, + NULL + ); + } gBS->CloseProtocol ( Controller, -- cgit v1.2.3