The Driver Binding Protocol Stop() function for the UndiRuntimeDxe is performing...

[mirror_edk2.git] / OptionRomPkg / UndiRuntimeDxe / Init.c

diff --git a/OptionRomPkg/UndiRuntimeDxe/Init.c b/OptionRomPkg/UndiRuntimeDxe/Init.c
index 10c26ad438b942d681e2dca4182ab63bdece61f7..49ec0d5dedcb04eb4839ed97a0ddfd9e06e9d813 100644 (file)
--- a/OptionRomPkg/UndiRuntimeDxe/Init.c
+++ b/OptionRomPkg/UndiRuntimeDxe/Init.c
@@ -1,7 +1,7 @@
 /** @file\r
   Initialization functions for EFI UNDI32 driver.\r
 \r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -616,38 +616,38 @@ UndiDriverStop (
 \r
       UNDI32Device = UNDI_DEV_FROM_THIS (NIIProtocol);\r
 \r
-      Status = gBS->UninstallMultipleProtocolInterfaces (\r
-                      ChildHandleBuffer[Index],\r
-                      &gEfiDevicePathProtocolGuid,\r
-                      UNDI32Device->Undi32DevPath,\r
-                      &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
-                      &UNDI32Device->NIIProtocol_31,\r
-                      NULL\r
+      Status = gBS->CloseProtocol (\r
+                      Controller,\r
+                      &gEfiPciIoProtocolGuid,\r
+                      This->DriverBindingHandle,\r
+                      ChildHandleBuffer[Index]\r
                       );\r
       if (!EFI_ERROR (Status)) {\r
-        //\r
-        // Restore original PCI attributes\r
-        //\r
-        Status = UNDI32Device->NicInfo.Io_Function->Attributes (\r
-                                                      UNDI32Device->NicInfo.Io_Function,\r
-                                                      EfiPciIoAttributeOperationSet,\r
-                                                      UNDI32Device->NicInfo.OriginalPciAttributes,\r
-                                                      NULL\r
-                                                      );\r
-        ASSERT_EFI_ERROR (Status);\r
-\r
-        Status = gBS->CloseProtocol (\r
-                        Controller,\r
-                        &gEfiPciIoProtocolGuid,\r
-                        This->DriverBindingHandle,\r
-                        ChildHandleBuffer[Index]\r
+        Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                        ChildHandleBuffer[Index],\r
+                        &gEfiDevicePathProtocolGuid,\r
+                        UNDI32Device->Undi32DevPath,\r
+                        &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
+                        &UNDI32Device->NIIProtocol_31,\r
+                        NULL\r
                         );\r
-\r
-        ASSERT_EFI_ERROR (Status);\r
-\r
-        gBS->FreePool (UNDI32Device->Undi32DevPath);\r
-        gBS->FreePool (UNDI32Device);\r
-\r
+        if (!EFI_ERROR (Status)) {\r
+          //\r
+          // Restore original PCI attributes\r
+          //\r
+          Status = UNDI32Device->NicInfo.Io_Function->Attributes (\r
+                                                        UNDI32Device->NicInfo.Io_Function,\r
+                                                        EfiPciIoAttributeOperationSet,\r
+                                                        UNDI32Device->NicInfo.OriginalPciAttributes,\r
+                                                        NULL\r
+                                                        );\r
+\r
+          ASSERT_EFI_ERROR (Status);\r
+\r
+          gBS->FreePool (UNDI32Device->Undi32DevPath);\r
+          gBS->FreePool (UNDI32Device);\r
+\r
+        }\r
       }\r
     }\r
 \r