Fix an issue that upper layer driver can not use NIC card in its driver binding stop().

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

diff --git a/OptionRomPkg/UndiRuntimeDxe/Init.c b/OptionRomPkg/UndiRuntimeDxe/Init.c
index 77931681e7b79a841482785d24496b9a5845748c..d6ad430a6331bb0eb58fc67fd6f388344b5e2771 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 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -573,7 +573,6 @@ UndiDriverStop (
   UINTN                                     Index;\r
   UNDI32_DEV                                *UNDI32Device;\r
   EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL *NIIProtocol;\r
-  EFI_PCI_IO_PROTOCOL                       *PciIo;\r
 \r
   //\r
   // Complete all outstanding transactions to Controller.\r
@@ -617,24 +616,6 @@ UndiDriverStop (
 \r
       UNDI32Device = UNDI_DEV_FROM_THIS (NIIProtocol);\r
 \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
-                      );\r
-\r
       Status = gBS->UninstallMultipleProtocolInterfaces (\r
                       ChildHandleBuffer[Index],\r
                       &gEfiDevicePathProtocolGuid,\r
@@ -643,19 +624,30 @@ UndiDriverStop (
                       &UNDI32Device->NIIProtocol_31,\r
                       NULL\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
+                        );\r
+\r
+        ASSERT_EFI_ERROR (Status);\r
 \r
-      if (EFI_ERROR (Status)) {\r
-        gBS->OpenProtocol (\r
-              Controller,\r
-              &gEfiPciIoProtocolGuid,\r
-              (VOID **) &PciIo,\r
-              This->DriverBindingHandle,\r
-              ChildHandleBuffer[Index],\r
-              EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
-              );\r
-      } else {\r
         gBS->FreePool (UNDI32Device->Undi32DevPath);\r
         gBS->FreePool (UNDI32Device);\r
+\r
       }\r
     }\r
 \r