1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index c2eea2767e10..11dafc0ee994 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -385,6 +385,8 @@ static int i8042_enable_kbd_port(void)
         i8042_ctr |= I8042_CTR_KBDINT;
 
         if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
+                i8042_ctr &= ~I8042_CTR_KBDINT;
+                i8042_ctr |= I8042_CTR_KBDDIS;
                 printk(KERN_ERR "i8042.c: Failed to enable KBD port.\n");
                 return -EIO;
         }
@@ -402,6 +404,8 @@ static int i8042_enable_aux_port(void)
         i8042_ctr |= I8042_CTR_AUXINT;
 
         if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
+                i8042_ctr &= ~I8042_CTR_AUXINT;
+                i8042_ctr |= I8042_CTR_AUXDIS;
                 printk(KERN_ERR "i8042.c: Failed to enable AUX port.\n");
                 return -EIO;
         }