diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-08 07:28:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-08 07:28:30 -0800 |
| commit | 0ce3c83a9c22f59937b86c80b478dfbffe54dbab (patch) | |
| tree | 3c842948d1700ab114fde37249b893b7291ca8a6 /drivers/input/serio | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | Input: i8042 - another attempt to fix AUX delivery checks (diff) | |
| download | linux-dev-0ce3c83a9c22f59937b86c80b478dfbffe54dbab.tar.xz linux-dev-0ce3c83a9c22f59937b86c80b478dfbffe54dbab.zip | |
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.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index ec195a36e8f6..db9cca3b65e0 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(¶m, I8042_CMD_AUX_LOOP) || param != 0x5a) { + retval = i8042_command(¶m, 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; } /* |