Fix name conflict for GetVariable defined in UefiLib.h

[mirror_edk2.git] / MdeModulePkg / Universal / Console / GraphicsConsoleDxe / GraphicsConsole.c

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index bdcc19e41a416fb010a4ec10c5e9457930d0dbf0..45f447b52fa993d2e6a53410b340ef4966001844 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -535,29 +535,28 @@ Error:
     //\r
     if (Private->GraphicsOutput != NULL) {\r
       gBS->CloseProtocol (\r
-            Controller,\r
-            &gEfiGraphicsOutputProtocolGuid,\r
-            This->DriverBindingHandle,\r
-            Controller\r
-            );\r
+             Controller,\r
+             &gEfiGraphicsOutputProtocolGuid,\r
+             This->DriverBindingHandle,\r
+             Controller\r
+             );\r
     } else if (FeaturePcdGet (PcdUgaConsumeSupport)) {\r
       gBS->CloseProtocol (\r
-            Controller,\r
-            &gEfiUgaDrawProtocolGuid,\r
-            This->DriverBindingHandle,\r
-            Controller\r
-            );\r
+             Controller,\r
+             &gEfiUgaDrawProtocolGuid,\r
+             This->DriverBindingHandle,\r
+             Controller\r
+             );\r
+    }\r
+\r
+    if (Private->LineBuffer != NULL) {\r
+      FreePool (Private->LineBuffer);\r
     }\r
 \r
     //\r
     // Free private data\r
     //\r
-    if (Private != NULL) {\r
-      if (Private->LineBuffer != NULL) {\r
-        FreePool (Private->LineBuffer);\r
-      }\r
-      FreePool (Private);\r
-    }\r
+    FreePool (Private);\r
   }\r
 \r
   return Status;\r
@@ -642,13 +641,14 @@ GraphicsConsoleControllerDriverStop (
       mFirstAccessFlag = TRUE;\r
     }\r
 \r
+    if (Private->LineBuffer != NULL) {\r
+      FreePool (Private->LineBuffer);\r
+    }\r
+\r
     //\r
     // Free our instance data\r
     //\r
-    if (Private != NULL) {\r
-      FreePool (Private->LineBuffer);\r
-      FreePool (Private);\r
-    }\r
+    FreePool (Private);\r
   }\r
 \r
   return Status;\r