X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FBus%2FScsi%2FScsiDisk%2FDxe%2FComponentName.c;h=74a41e869e1f7e03f901b87ff044bfcee461d874;hp=15f02d6c41a22b53fea34991ffe9d088f52e79a4;hb=9c198b406677e91274146dad8d0c723a68228d4e;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4

diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c
index 15f02d6c41..74a41e869e 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c
@@ -19,27 +19,6 @@ Abstract:
 
 #include "ScsiDisk.h"
 
-//
-// EFI Component Name Functions
-//
-EFI_STATUS
-EFIAPI
-ScsiDiskComponentNameGetDriverName (
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,
-  IN  CHAR8                        *Language,
-  OUT CHAR16                       **DriverName
-  );
-
-EFI_STATUS
-EFIAPI
-ScsiDiskComponentNameGetControllerName (
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,
-  IN  EFI_HANDLE                                      ControllerHandle,
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,
-  IN  CHAR8                                           *Language,
-  OUT CHAR16                                          **ControllerName
-  );
-
 //
 // EFI Component Name Protocol
 //
@@ -162,6 +141,17 @@ ScsiDiskComponentNameGetControllerName (
     return EFI_UNSUPPORTED;
   }
   
+  //
+  // Make sure this driver is currently managing ControllerHandle
+  //
+  Status = EfiTestManagedDevice (
+             ControllerHandle,
+             gScsiDiskDriverBinding.DriverBindingHandle,
+             &gEfiScsiIoProtocolGuid
+             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
   //
   // Get the device context
   //