---

yaml --- r: 53415 b: refs/heads/master c: 8d04ddb h: refs/heads/master i: 53413: 3435361 53411: 4b538a9 53407: 95eba17 v: v3
git-mirror · Apr 12, 2007 · 855dcfc · 855dcfc
1 parent eeed313
commit 855dcfc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d9d93c411c9351ba186f5ec910b10da7c1d9d14
+refs/heads/master: 8d04ddb64c7bf62aec1102fddc5336a68bcaebe9
diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c
@@ -761,6 +761,13 @@ static void i8042_controller_reset(void)
 {
 	i8042_flush();
 
+/*
+ * Disable both KBD and AUX interfaces so they don't get in the way
+ */
+
+	i8042_ctr |= I8042_CTR_KBDDIS | I8042_CTR_AUXDIS;
+	i8042_ctr &= ~(I8042_CTR_KBDINT | I8042_CTR_AUXINT);
+
 /*
  * Disable MUX mode if present.
  */