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

1 files changed, 11 insertions, 13 deletions

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index 573374f59b..8a46972f7d 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -792,7 +792,6 @@ DriverSampleInit (
   )

 {

   EFI_STATUS                      Status;

-  EFI_STATUS                      SavedStatus;

   EFI_HII_HANDLE                  HiiHandle[2];

   EFI_SCREEN_DESCRIPTOR           Screen;

   EFI_HII_DATABASE_PROTOCOL       *HiiDatabase;

@@ -967,8 +966,6 @@ DriverSampleInit (
              );

     }

   }

-  

-  SavedStatus = EFI_SUCCESS;

 

   //

   // Default this driver is built into Flash device image, 

@@ -993,20 +990,13 @@ DriverSampleInit (
                              NULL,

                              NULL

                              );

-    SavedStatus = Status;

   

-    Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[0]);

-    if (EFI_ERROR (Status)) {

-      return Status;

-    }

+    HiiRemovePackages (HiiHandle[0]);

   

-    Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[1]);

-    if (EFI_ERROR (Status)) {

-      return Status;

-    }

+    HiiRemovePackages (HiiHandle[1]);

   }

 

-  return SavedStatus;

+  return Status;

 }

 

 /**

@@ -1042,6 +1032,14 @@ DriverSampleUnload (
            );

   }

 

+  if (PrivateData->HiiHandle[0] != NULL) {

+    HiiRemovePackages (PrivateData->HiiHandle[0]);

+  }

+

+  if (PrivateData->HiiHandle[1] != NULL) {

+    HiiRemovePackages (PrivateData->HiiHandle[1]);

+  }

+

   if (PrivateData != NULL) {

     FreePool (PrivateData);

   }