From f0c855b26386c16ba0a70600d72cd09c090db0e0 Mon Sep 17 00:00:00 2001
From: rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 17 May 2010 08:32:05 +0000
Subject: Small code refinement in MdeModulePkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10492 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'MdeModulePkg/Universal/DriverSampleDxe')

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index ff9e4b2179..e490ca45d8 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -1433,6 +1433,9 @@ DriverSampleUnload (
   )
 {
   UINTN Index;
+
+  ASSERT (PrivateData != NULL);
+
   if (DriverHandle[0] != NULL) {
     gBS->UninstallMultipleProtocolInterfaces (
             DriverHandle[0],
@@ -1463,15 +1466,13 @@ DriverSampleUnload (
     HiiRemovePackages (PrivateData->HiiHandle[1]);
   }
 
-  if (PrivateData != NULL) {
-    for (Index = 0; Index < NAME_VALUE_NAME_NUMBER; Index++) {
-      if (PrivateData->NameValueName[Index] != NULL) {
-        FreePool (PrivateData->NameValueName[Index]);
-      }
+  for (Index = 0; Index < NAME_VALUE_NAME_NUMBER; Index++) {
+    if (PrivateData->NameValueName[Index] != NULL) {
+      FreePool (PrivateData->NameValueName[Index]);
     }
-    FreePool (PrivateData);
-    PrivateData = NULL;
   }
+  FreePool (PrivateData);
+  PrivateData = NULL;
 
   return EFI_SUCCESS;
 }
-- 
cgit v1.2.3