3 files changed, 6 insertions, 7 deletions
diff --git a/MdeModulePkg/Include/Guid/ConnectConInEvent.h b/MdeModulePkg/Include/Guid/ConnectConInEvent.h
index fb9d52b174..28dd4b93de 100644
--- a/MdeModulePkg/Include/Guid/ConnectConInEvent.h
+++ b/MdeModulePkg/Include/Guid/ConnectConInEvent.h
@@ -1,6 +1,6 @@
 /** @file
-  GUID is the name of events used with CreateEventEx in order to be notified
-  when the requires ConIn connection.
+  GUID for an event that is signaled on the first attempt to check for a keystroke 
+  from the ConIn device.
 
   Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index d34e7ce5aa..870d429c7a 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -630,7 +630,7 @@ ConSplitterTextInConstructor (
                   ConSplitterEmptyCallbackFunction,
                   NULL,
                   &gConnectConInEventGuid,
-                  &ConInPrivate->ConnectConIn
+                  &ConInPrivate->ConnectConInEvent
                   );
 
   return Status;
@@ -3355,7 +3355,7 @@ ConSplitterTextInReadKeyStroke (
   //
   if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {
     DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));    
-    gBS->SignalEvent (Private->ConnectConIn);
+    gBS->SignalEvent (Private->ConnectConInEvent);
     mConInIsConnect = TRUE;
   }
 
@@ -3543,7 +3543,7 @@ ConSplitterTextInReadKeyStrokeEx (
   //
   if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {
     DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));    
-    gBS->SignalEvent (Private->ConnectConIn);
+    gBS->SignalEvent (Private->ConnectConInEvent);
     mConInIsConnect = TRUE;
   }
 
@@ -4727,5 +4727,4 @@ ConSplitterEmptyCallbackFunction (
   IN VOID                     *Context
   )
 {
-  return;
 }
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index b5b1435d92..e32abbaea1 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
@@ -145,7 +145,7 @@ typedef struct {
 
   BOOLEAN                            KeyEventSignalState;
   BOOLEAN                            InputEventSignalState;
-  EFI_EVENT                          ConnectConIn;
+  EFI_EVENT                          ConnectConInEvent;
 } TEXT_IN_SPLITTER_PRIVATE_DATA;
 
 #define TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_THIS(a)  \