Return-Path: Received: from mnm [127.0.0.1] by localhost with POP3 (fetchmail-5.9.0) for akpm@localhost (single-drop); Sat, 03 Jan 2004 01:07:02 -0800 (PST) Received: from fire-1.osdl.org (air1.pdx.osdl.net [172.20.0.5]) by mail.osdl.org (8.11.6/8.11.6) with ESMTP id i0394VM06897 for ; Sat, 3 Jan 2004 01:04:31 -0800 Received: from smtp811.mail.sc5.yahoo.com (smtp811.mail.sc5.yahoo.com [66.163.170.81]) by fire-1.osdl.org (8.12.8/8.12.8) with SMTP id i0394VN2015990 for ; Sat, 3 Jan 2004 01:04:31 -0800 Received: from unknown (HELO coreip.homeip.net) (dtor?core@ameritech.net@68.73.150.153 with login) by smtp811.mail.sc5.yahoo.com with SMTP; 3 Jan 2004 09:04:30 -0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by coreip.homeip.net (Postfix) with ESMTP id B560EF6A70; Sat, 3 Jan 2004 04:04:29 -0500 (EST) Received: from coreip.homeip.net ([127.0.0.1]) by localhost (core.prvt.inr.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 02252-05-4; Sat, 3 Jan 2004 04:04:25 -0500 (EST) Received: by coreip.homeip.net (Postfix, from userid 500) id C0205F6BDF; Sat, 3 Jan 2004 04:03:54 -0500 (EST) From: Dmitry Torokhov To: Vojtech Pavlik Subject: Re: [PATCH 7/7] SiS AUX port Date: Sat, 3 Jan 2004 04:03:44 -0500 User-Agent: KMail/1.5.4 Cc: Andrew Morton , linux-kernel@vger.kernel.org References: <200401030350.43437.dtor_core@ameritech.net> <200401030402.16745.dtor_core@ameritech.net> <200401030403.03783.dtor_core@ameritech.net> In-Reply-To: <200401030403.03783.dtor_core@ameritech.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200401030403.45760.dtor_core@ameritech.net> X-Virus-Scanned: by amavisd-new at coreip.homeip.net X-MIMEDefang-Filter: osdl$Revision: 1.45 $ X-Scanned-By: MIMEDefang 2.36 X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on mnm X-Spam-Level: X-Spam-Status: No, hits=-4.9 required=2.0 tests=BAYES_00 autolearn=ham version=2.60 =================================================================== ChangeSet@1.1577, 2004-01-03 02:54:28-05:00, dtor_core@ameritech.net Input: 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). i8042.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) =================================================================== diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c --- a/drivers/input/serio/i8042.c Sat Jan 3 03:10:31 2004 +++ b/drivers/input/serio/i8042.c Sat Jan 3 03:10:31 2004 @@ -598,8 +598,10 @@ 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;