Fix component name bugs when input Controller Name is invalid

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / Ehci / Dxe / ComponentName.c

diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/ComponentName.c b/EdkModulePkg/Bus/Pci/Ehci/Dxe/ComponentName.c
index e0d2010cd44f97c7d6594b01eac604d1fc3b6bb9..12cb7665d1b13e8181fa821282bbbe08e8ea0759 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/ComponentName.c
+++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/ComponentName.c
@@ -162,6 +162,17 @@ EhciComponentNameGetControllerName (
     return EFI_UNSUPPORTED;\r
   }\r
   //\r
+  // Make sure this driver is currently managing ControllerHandle\r
+  //\r
+  Status = EfiTestManagedDevice (\r
+             ControllerHandle,\r
+             gEhciDriverBinding.DriverBindingHandle,\r
+             &gEfiPciIoProtocolGuid\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+  //\r
   // Get the device context\r
   //\r
   Status = gBS->OpenProtocol (\r