Fix component name bugs when input Controller Name is invalid

Fix the driver binding version for platform/OEM specific drivers git-svn-id: https://fat-driver2.tianocore.org/svn/fat-driver2/trunk@13 65ba2f78-6c18-0410-a7b4-885970cf29fa
mcb30 · Jan 19, 2007 · c4fbf64 · c4fbf64
1 parent 77be429
commit c4fbf64
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/EnhancedFat/Dxe/ComponentName.c b/EnhancedFat/Dxe/ComponentName.c
@@ -171,13 +171,26 @@ Routine Description:
 
 --*/
 {
+  EFI_STATUS  Status;
   //
   // This is a device driver, so ChildHandle must be NULL.
   //
   if (ChildHandle != NULL) {
     return EFI_UNSUPPORTED;
   }
 
+  //
+  // Make sure this driver is currently managing ControllHandle
+  //
+  Status = EfiTestManagedDevice (
+             ControllerHandle,
+             gFatDriverBinding.DriverBindingHandle,
+             &gEfiDiskIoProtocolGuid
+             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
   return EfiLibLookupUnicodeString (
            Language,
            gFatComponentName.SupportedLanguages,

diff --git a/EnhancedFat/Dxe/Fat.c b/EnhancedFat/Dxe/Fat.c
@@ -63,7 +63,7 @@ EFI_DRIVER_BINDING_PROTOCOL gFatDriverBinding = {
   FatDriverBindingSupported,
   FatDriverBindingStart,
   FatDriverBindingStop,
-  0x10,
+  0xa,
   NULL,
   NULL
 };