3 files changed, 2 insertions, 14 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index 362533f930..657c65b851 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
@@ -501,10 +501,6 @@ KbdControllerDriverStop (
     gBS->CloseEvent (ConsoleIn->TimerEvent);
     ConsoleIn->TimerEvent = NULL;
   }
-  //
-  // Disable the keyboard interface
-  //
-  Status = DisableKeyboard (ConsoleIn);
 
   //
   // Since there will be no timer handler for keyboard input any more,
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
index 8fc56fc64b..c5a7e3713b 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
@@ -2,7 +2,7 @@
   A faked PS/2 Absolute Pointer driver. Routines that interacts with callers,
   conforming to EFI driver model
   
-Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -444,10 +444,6 @@ PS2MouseAbsolutePointerDriverStop (
   if (EFI_ERROR (Status)) {
     return Status;
   }
-  //
-  // Disable mouse on keyboard controller
-  //
-  KbcDisableAux (MouseAbsolutePointerDev->IsaIo);
 
   //
   // Cancel mouse data polling timer, close timer event
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
index d50a7587fd..3e6e2f5937 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
@@ -2,7 +2,7 @@
   PS/2 Mouse driver. Routines that interacts with callers,
   conforming to EFI driver model.
   
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -458,10 +458,6 @@ PS2MouseDriverStop (
   if (EFI_ERROR (Status)) {
     return Status;
   }
-  //
-  // Disable mouse on keyboard controller
-  //
-  KbcDisableAux (MouseDev->IsaIo);
 
   //
   // Cancel mouse data polling timer, close timer event