git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
input
/
serio
/
i8042.c
diff --git
a/drivers/input/serio/i8042.c
b/drivers/input/serio/i8042.c
index
db9cca3
..
7c17377
100644
(file)
--- a/
drivers/input/serio/i8042.c
+++ b/
drivers/input/serio/i8042.c
@@
-767,6
+767,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.
*/