Re: [PATCH 1/1] Input - alps: Fix button reporting on the V2 Alps protocol
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2015-07-29 21:01:15
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2015-07-29 21:01:15
On Wed, Jul 29, 2015 at 04:45:26PM -0400, cpaul@redhat.com wrote:
From: Stephen Chandler Paul <redacted> The data concerning which buttons on the touchpad are held down or not are in the fourth packet we receive from the mouse, not the first. Signed-off-by: Stephen Chandler Paul <redacted>
Let's also make sure it hoes not break Hans' (de Bruin) touchpad.
--- drivers/input/mouse/alps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 113d6f1..e2f9b25 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c@@ -254,9 +254,9 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse) /* Non interleaved V2 dualpoint has separate stick button bits */ if (priv->proto_version == ALPS_PROTO_V2 && priv->flags == (ALPS_PASS | ALPS_DUALPOINT)) { - left |= packet[0] & 1; - right |= packet[0] & 2; - middle |= packet[0] & 4; + left |= packet[3] & 1; + right |= packet[3] & 2; + middle |= packet[3] & 4; } alps_report_buttons(dev, dev2, left, right, middle);-- 2.4.3
-- Dmitry