diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-03-19 09:06:25 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-03-23 12:49:27 -0700 |
| commit | 6f09b7b3b28cd65c9a08757fcf6d9762d541ef9a (patch) | |
| tree | ad52cdd943c28e766dc0c926e881db39ca121b2f | |
| parent | 8479fc42c9696c54858aa8cbb1052c26571436c5 (diff) | |
| download | linux-stable-6f09b7b3b28cd65c9a08757fcf6d9762d541ef9a.tar.gz linux-stable-6f09b7b3b28cd65c9a08757fcf6d9762d541ef9a.tar.bz2 linux-stable-6f09b7b3b28cd65c9a08757fcf6d9762d541ef9a.zip | |
Input: i8042 - fix AUX IRQ delivery check
Input: i8042 - fix AUX IRQ delivery check
On boxes that do not implement AUX LOOP command we can not
verify AUX IRQ delivery and must assume that it is wired
properly.
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/input/serio/i8042.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 1364c7964db4..c3fdfc1f342a 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -543,6 +543,7 @@ static int __devinit i8042_check_aux(void) { int retval = -1; int irq_registered = 0; + int aux_loop_broken = 0; unsigned long flags; unsigned char param; @@ -572,6 +573,8 @@ static int __devinit i8042_check_aux(void) if (i8042_command(¶m, I8042_CMD_AUX_TEST) || (param && param != 0xfa && param != 0xff)) return -1; + + aux_loop_broken = 1; } /* @@ -595,7 +598,7 @@ static int __devinit i8042_check_aux(void) * used it for a PCI card or somethig else. */ - if (i8042_noloop) { + if (i8042_noloop || aux_loop_broken) { /* * Without LOOP command we can't test AUX IRQ delivery. Assume the port * is working and hope we are right. |