diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-03-07 23:20:55 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-03-07 23:20:55 -0500 |
| commit | 3ca5de6dd4ec5a139b2b8f00dce3e4726ca91af1 (patch) | |
| tree | f4218d29dad00a6b1df243660e72cbb29aaed129 /drivers/input | |
| parent | 62b529a7b9c11880a8820494a25db0e2ecdf3bed (diff) | |
| download | blackbird-op-linux-3ca5de6dd4ec5a139b2b8f00dce3e4726ca91af1.tar.gz blackbird-op-linux-3ca5de6dd4ec5a139b2b8f00dce3e4726ca91af1.zip | |
Input: i8042 - another attempt to fix AUX delivery checks
Do not assume that AUX_LOOP command is broken unless it
completes successfully but returns wrong (unexpected) data.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -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; } /* |
