From 0fe28f54aa340811aef8e18546cfe0800c406e7b Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 18 Jan 2004 18:08:50 -0800 Subject: [PATCH] [PATCH] input: SiS AUX port From: Dmitry Torokhov 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). --- drivers/input/serio/i8042.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index dab002a13a70a..ed6134eba4aa5 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; -- 2.53.0