From 9b5e2efb3c2c704efa8b0a179daa29c9c59fe9cd Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 18 Jul 2007 01:20:41 -0400 Subject: [PATCH] --- yaml --- r: 69353 b: refs/heads/master c: 018db6bb0d726c3683a5e1eb4621e728965db94c h: refs/heads/master i: 69351: 5fd10ada8d11a091a554dbfc12ecf26687e26a27 v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/i8042.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 69ffc82383a0..f43ba7b05810 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20b3cdd6773be09f7bf52113de0d0c37da287f29 +refs/heads/master: 018db6bb0d726c3683a5e1eb4621e728965db94c diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c index 3888dc307e0c..42aa4ec72661 100644 --- a/trunk/drivers/input/serio/i8042.c +++ b/trunk/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; }