aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-08 07:28:30 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-08 07:28:30 -0800
commit0ce3c83a9c22f59937b86c80b478dfbffe54dbab (patch)
tree3c842948d1700ab114fde37249b893b7291ca8a6 /drivers/input/serio
parenteee8abe5de9cbd936b51db292c8d3c406b0e79e7 (diff)
parent3ca5de6dd4ec5a139b2b8f00dce3e4726ca91af1 (diff)
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: Input: i8042 - another attempt to fix AUX delivery checks
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/i8042.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index ec195a36e8f..db9cca3b65e 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -553,7 +553,8 @@ static int __devinit i8042_check_aux(void)
*/
param = 0x5a;
- if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0x5a) {
+ retval = i8042_command(&param, I8042_CMD_AUX_LOOP);
+ if (retval || param != 0x5a) {
/*
* External connection test - filters out AT-soldered PS/2 i8042's
@@ -567,7 +568,12 @@ static int __devinit i8042_check_aux(void)
(param && param != 0xfa && param != 0xff))
return -1;
- aux_loop_broken = 1;
+/*
+ * If AUX_LOOP completed without error but returned unexpected data
+ * mark it as broken
+ */
+ if (!retval)
+ aux_loop_broken = 1;
}
/*