Pass correct device path to uninstall the handle on which default config access proto...

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiOnUefiHiiThunk / ConfigAccess.c

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
index 16630b4b7cccd17650f396df37597b1aa19651c7..117d6ea636ebd000f05920020a05e410061294de 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
@@ -274,7 +274,8 @@ UninstallDefaultConfigAccessProtocol (
 {\r
   EFI_STATUS                      Status;\r
   EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;\r
-  \r
+  HII_VENDOR_DEVICE_PATH          *HiiVendorPath;\r
+\r
   Status = gBS->HandleProtocol (\r
                   ThunkContext->UefiHiiDriverHandle,\r
                   &gEfiHiiConfigAccessProtocolGuid,\r
@@ -282,10 +283,17 @@ UninstallDefaultConfigAccessProtocol (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
+  Status = gBS->HandleProtocol (\r
+                  ThunkContext->UefiHiiDriverHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  (VOID **) &HiiVendorPath\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
   Status = gBS->UninstallMultipleProtocolInterfaces (\r
                   ThunkContext->UefiHiiDriverHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  &mUefiHiiVendorDevicePath,\r
+                  HiiVendorPath,\r
                   &gEfiHiiConfigAccessProtocolGuid,\r
                   ConfigAccess,\r
                   NULL\r