Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S268247AbUI2GvE (ORCPT ); Wed, 29 Sep 2004 02:51:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S268235AbUI2GtL (ORCPT ); Wed, 29 Sep 2004 02:49:11 -0400 Received: from smtp802.mail.sc5.yahoo.com ([66.163.168.181]:36718 "HELO smtp802.mail.sc5.yahoo.com") by vger.kernel.org with SMTP id S268236AbUI2GsC (ORCPT ); Wed, 29 Sep 2004 02:48:02 -0400 From: Dmitry Torokhov To: Vojtech Pavlik Subject: [PATCH 3/8] Guest protocol switch in synaptics Date: Wed, 29 Sep 2004 01:43:09 -0500 User-Agent: KMail/1.6.2 Cc: LKML References: <200409290140.53350.dtor_core@ameritech.net> <200409290141.48766.dtor_core@ameritech.net> <200409290142.33707.dtor_core@ameritech.net> In-Reply-To: <200409290142.33707.dtor_core@ameritech.net> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <200409290143.11562.dtor_core@ameritech.net> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1524 Lines: 46 =================================================================== ChangeSet@1.1949, 2004-09-28 00:07:41-05:00, dtor_core@ameritech.net Input: synaptics - not only switch to 4-byte client protocol but also revert to 3-byte mode if client selected lower protocol. Signed-off-by: Dmitry Torokhov synaptics.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) =================================================================== diff -Nru a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c --- a/drivers/input/mouse/synaptics.c 2004-09-29 01:16:30 -05:00 +++ b/drivers/input/mouse/synaptics.c 2004-09-29 01:16:30 -05:00 @@ -264,10 +264,14 @@ struct synaptics_data *priv = psmouse->private; /* adjust the touchpad to child's choice of protocol */ - if (child && child->type >= PSMOUSE_GENPS) { - priv->mode |= SYN_BIT_FOUR_BYTE_CLIENT; + if (child) { + if (child->type >= PSMOUSE_GENPS) + priv->mode |= SYN_BIT_FOUR_BYTE_CLIENT; + else + priv->mode &= ~SYN_BIT_FOUR_BYTE_CLIENT; + if (synaptics_mode_cmd(psmouse, priv->mode)) - printk(KERN_INFO "synaptics: failed to enable 4-byte guest protocol\n"); + printk(KERN_INFO "synaptics: failed to switch guest protocol\n"); } } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/