diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-01-18 18:08:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-18 18:08:50 -0800 |
| commit | 0fe28f54aa340811aef8e18546cfe0800c406e7b (patch) | |
| tree | 4c3833587bfcb43b2aedd1b62d0cc18ded6a90d6 /drivers/input | |
| parent | 6fdc2278cedcf48191db11c7fdf3f134bfd92d36 (diff) | |
[PATCH] input: SiS AUX port
From: Dmitry Torokhov <dtor_core@ameritech.net>
Do not ignore AUX port if chipset fails to disable it (SiS seems to have
trouble disabling AUX port, other than that the port works fine).
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/i8042.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index dab002a13a70..ed6134eba4aa 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -598,8 +598,10 @@ static int __init i8042_check_aux(struct i8042_values *values) if (i8042_command(¶m, I8042_CMD_AUX_DISABLE)) return -1; - if (i8042_command(¶m, I8042_CMD_CTL_RCTR) || (~param & I8042_CTR_AUXDIS)) - return -1; + if (i8042_command(¶m, I8042_CMD_CTL_RCTR) || (~param & I8042_CTR_AUXDIS)) { + printk(KERN_WARNING "Failed to disable AUX port, but continuing anyway... Is this a SiS?\n"); + printk(KERN_WARNING "If AUX port is really absent please use the 'i8042.noaux' option.\n"); + } if (i8042_command(¶m, I8042_CMD_AUX_ENABLE)) return -1; |