1 files changed, 6 insertions, 4 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index b09193cee1..59c416628c 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
@@ -353,11 +353,13 @@ ErrorExit:
   // Since there will be no timer handler for keyboard input any more,
   // exhaust input data just in case there is still keyboard data left
   //
-  Status1 = EFI_SUCCESS;
-  while (!EFI_ERROR (Status1)) {
-    Status1 = KeyboardRead (ConsoleIn, &Data);;
+  if (ConsoleIn != NULL) {
+    Status1 = EFI_SUCCESS;
+    while (!EFI_ERROR (Status1)) {
+      Status1 = KeyboardRead (ConsoleIn, &Data);;
+    }
   }
-
+  
   if (ConsoleIn != NULL) {
     gBS->FreePool (ConsoleIn);
   }