update DriverSample driver unload function to remove the installed package list.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8171 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index 573374f59bf949421f0d8f54c19306191519496a..8a46972f7d232dc8317104b9fbb8e7cd4cebc01a 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -792,7 +792,6 @@ DriverSampleInit (
   )\r
 {\r
   EFI_STATUS                      Status;\r
-  EFI_STATUS                      SavedStatus;\r
   EFI_HII_HANDLE                  HiiHandle[2];\r
   EFI_SCREEN_DESCRIPTOR           Screen;\r
   EFI_HII_DATABASE_PROTOCOL       *HiiDatabase;\r
@@ -967,8 +966,6 @@ DriverSampleInit (
              );\r
     }\r
   }\r
-  \r
-  SavedStatus = EFI_SUCCESS;\r
 \r
   //\r
   // Default this driver is built into Flash device image, \r
@@ -993,20 +990,13 @@ DriverSampleInit (
                              NULL,\r
                              NULL\r
                              );\r
-    SavedStatus = Status;\r
   \r
-    Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[0]);\r
-    if (EFI_ERROR (Status)) {\r
-      return Status;\r
-    }\r
+    HiiRemovePackages (HiiHandle[0]);\r
   \r
-    Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[1]);\r
-    if (EFI_ERROR (Status)) {\r
-      return Status;\r
-    }\r
+    HiiRemovePackages (HiiHandle[1]);\r
   }\r
 \r
-  return SavedStatus;\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -1042,6 +1032,14 @@ DriverSampleUnload (
            );\r
   }\r
 \r
+  if (PrivateData->HiiHandle[0] != NULL) {\r
+    HiiRemovePackages (PrivateData->HiiHandle[0]);\r
+  }\r
+\r
+  if (PrivateData->HiiHandle[1] != NULL) {\r
+    HiiRemovePackages (PrivateData->HiiHandle[1]);\r
+  }\r
+\r
   if (PrivateData != NULL) {\r
     FreePool (PrivateData);\r
   }\r