Commit 0fe28f54 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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).
parent 6fdc2278
...@@ -598,8 +598,10 @@ static int __init i8042_check_aux(struct i8042_values *values) ...@@ -598,8 +598,10 @@ static int __init i8042_check_aux(struct i8042_values *values)
if (i8042_command(&param, I8042_CMD_AUX_DISABLE)) if (i8042_command(&param, I8042_CMD_AUX_DISABLE))
return -1; return -1;
if (i8042_command(&param, I8042_CMD_CTL_RCTR) || (~param & I8042_CTR_AUXDIS)) if (i8042_command(&param, I8042_CMD_CTL_RCTR) || (~param & I8042_CTR_AUXDIS)) {
return -1; 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(&param, I8042_CMD_AUX_ENABLE)) if (i8042_command(&param, I8042_CMD_AUX_ENABLE))
return -1; return -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment