[Description]

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiDriver.c

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
index 8cc2a5050f9c793f78848b1a9f536d7eabff3d5d..bc777e7785f42517b4eaab1e7f365e08889c562e 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation\r
+Copyright (c) 2004 - 2008, Intel Corporation\r
 All rights reserved. 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
@@ -413,8 +413,21 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_STATUS  Status;\r
-  //EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;\r
+  EFI_STATUS                         Status;\r
+  EFI_ISCSI_INITIATOR_NAME_PROTOCOL  *IScsiInitiatorName;\r
+\r
+  //\r
+  // There should be only one EFI_ISCSI_INITIATOR_NAME_PROTOCOL.\r
+  //\r
+  Status = gBS->LocateProtocol (\r
+                   &gEfiIScsiInitiatorNameProtocolGuid,\r
+                   NULL,\r
+                   &IScsiInitiatorName\r
+                   );\r
+\r
+  if (!EFI_ERROR (Status)) {\r
+    return EFI_ACCESS_DENIED;\r
+  }\r
 \r
   //\r
   // Initialize the EFI Driver Library\r
@@ -427,12 +440,11 @@ Returns:
              &gIScsiComponentName,\r
              &gIScsiComponentName2\r
            );\r
-  \r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
 \r
   if (!EFI_ERROR (Status)) {\r
+    //\r
+    // Install the iSCSI Initiator Name Protocol.\r
+    //\r
     Status = gBS->InstallProtocolInterface (\r
                     &ImageHandle,\r
                     &gEfiIScsiInitiatorNameProtocolGuid,\r
@@ -450,13 +462,28 @@ Returns:
             &gIScsiComponentName,\r
             NULL\r
             );\r
+      return Status;\r
+    }\r
+  \r
+    //\r
+    // Initialize the configuration form of iSCSI.\r
+    //\r
+    Status = IScsiConfigFormInit (gIScsiDriverBinding.DriverBindingHandle);\r
+    if (EFI_ERROR (Status)) {\r
+      gBS->UninstallMultipleProtocolInterfaces (\r
+            ImageHandle,\r
+            &gEfiDriverBindingProtocolGuid,\r
+            &gIScsiDriverBinding,\r
+            &gEfiComponentName2ProtocolGuid,\r
+            &gIScsiComponentName2,\r
+            &gEfiComponentNameProtocolGuid,\r
+            &gIScsiComponentName,\r
+            &gEfiIScsiInitiatorNameProtocolGuid,\r
+            &gIScsiInitiatorName,\r
+            NULL\r
+            );\r
     }\r
   }\r
-  //\r
-  // Initialize the configuration form of iSCSI.\r
-  //\r
-  IScsiConfigFormInit (gIScsiDriverBinding.DriverBindingHandle);\r
-\r
   return Status;\r
 }\r
 \r