From: Kazuhiko Sakamoto <sakamoto.kazuh...@socionext.com>
Test the @ControllerHandle is not NULL and is actually managed by
this driver.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Kazuhiko Sakamoto <sakamoto.kazuh...@socionext.com>
Signed-off-by: Masami Hiramatsu <masami.hirama...@linaro.org>
---
Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h | 1 +
Silicon/Openmoko/ChaosKeyDxe/ComponentName.c | 13 +++++++++++++
Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c | 1 -
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h
b/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h
index 97cfbbb755..59582b3bf9 100644
--- a/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h
+++ b/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h
@@ -38,6 +38,7 @@ typedef struct {
CR(a, CHAOSKEY_DEV, Rng, CHAOSKEY_DEV_SIGNATURE)
extern EFI_COMPONENT_NAME2_PROTOCOL gChaosKeyDriverComponentName2;
+extern EFI_DRIVER_BINDING_PROTOCOL gUsbDriverBinding;
EFI_STATUS
ChaosKeyInit (
diff --git a/Silicon/Openmoko/ChaosKeyDxe/ComponentName.c
b/Silicon/Openmoko/ChaosKeyDxe/ComponentName.c
index 25117e2500..5b0f42cb67 100644
--- a/Silicon/Openmoko/ChaosKeyDxe/ComponentName.c
+++ b/Silicon/Openmoko/ChaosKeyDxe/ComponentName.c
@@ -159,6 +159,19 @@ ChaosKeyGetControllerName (
OUT CHAR16 **ControllerName
)
{
+ EFI_STATUS Status;
+
+ if (!ControllerHandle) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ Status = EfiTestManagedDevice (ControllerHandle,
+ gUsbDriverBinding.DriverBindingHandle,
+ &gEfiUsbIoProtocolGuid);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+
if (ChildHandle != NULL) {
return EFI_UNSUPPORTED;
}
diff --git a/Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c
b/Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c
index e7d0d3fe56..4cbd23ad36 100644
--- a/Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c
+++ b/Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c
@@ -146,7 +146,6 @@ UsbHwrngDriverBindingStop (
}
-STATIC
EFI_DRIVER_BINDING_PROTOCOL gUsbDriverBinding = {
UsbHwrngDriverBindingSupported,
UsbHwrngDriverBindingStart,
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#81861): https://edk2.groups.io/g/devel/message/81861
Mute This Topic: https://groups.io/mt/86281585/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
