From patchwork Sat Nov 5 16:44:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donohue X-Patchwork-Id: 9413769 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 466176022E for ; Sat, 5 Nov 2016 16:45:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B5402940D for ; Sat, 5 Nov 2016 16:45:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CCCD295C8; Sat, 5 Nov 2016 16:45:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8803F2940D for ; Sat, 5 Nov 2016 16:45:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755855AbcKEQpB (ORCPT ); Sat, 5 Nov 2016 12:45:01 -0400 Received: from Lepton.TopQuark.net ([168.235.66.66]:44235 "EHLO Mail2.TopQuark.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755486AbcKEQpA (ORCPT ); Sat, 5 Nov 2016 12:45:00 -0400 Received: from Mail1.TopQuark.net (pool-108-48-201-133.washdc.fios.verizon.net [108.48.201.133]) by Mail2.TopQuark.net (Postfix) with ESMTP id 645C1F6022E; Sat, 5 Nov 2016 12:44:59 -0400 (EDT) Received: from Mail1.TopQuark.net (unknown [127.0.0.1]) by Mail1.TopQuark.net (Postfix) with ESMTP id 068B027EE17A; Sat, 5 Nov 2016 12:44:59 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=PaulSD.com; h=date:from:to :cc:subject:message-id:references:mime-version:content-type :in-reply-to; s=mail; bh=IV7nackPhVWMvDdlKrrkzMDr1n0=; b=t0nb/St wuJV9X//s/8SKamtMbbSax35ZFwRLb+VdG64dWqyssd2B14yXMQ0GYQ18YW0u6rk eiDMveSJ3GCbEC4ExnipiC0fMAgvi2tTLrsUv69npiSU5MDRL+GKgfo+6Po5k0Yk cW0+S5OJpPm1qkran30WVtBR5k+7N0JRPGtk= Received: by Mail1.TopQuark.net (Postfix, from userid 1000) id DC1A627EE396; Sat, 5 Nov 2016 12:44:58 -0400 (EDT) Date: Sat, 5 Nov 2016 12:44:58 -0400 From: Paul Donohue To: Pali =?iso-8859-1?Q?Roh=E1r?= Cc: linux-input@vger.kernel.org, Ben Gamari , Michal Hocko Subject: [PATCH v2] Input: ALPS - Fix TrackStick support for SS5 hardware Message-ID: <20161105164458.GF2927@TopQuark.net> References: <20161024210122.GA2919@TopQuark.net> <20161101093507.GE3081@pali> <20161105163047.GE2927@TopQuark.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161105163047.GE2927@TopQuark.net> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The current Alps SS5 (SS4 v2) code generates bogus TouchPad events when TrackStick packets are processed. This causes the xorg synaptics driver to print "unable to find touch point 0" and "BUG: triggered 'if (priv->num_active_touches > priv->num_slots)'" messages. It also causes unexpected TouchPad button release and reclick event sequences if the TrackStick is moved while holding a TouchPad button. This commit corrects the problem by adjusting alps_process_packet_ss4_v2() so that it only sends TrackStick reports when processing TrackStick packets. Signed-off-by: Paul Donohue --- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 6d7de9b..1d0302b 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -1279,6 +1279,8 @@ static int alps_decode_ss4_v2(struct alps_fields *f, input_report_rel(priv->dev2, REL_Y, -y); input_report_abs(priv->dev2, ABS_PRESSURE, pressure); } + f->first_mp = 0; + f->is_mp = 0; break; case SS4_PACKET_ID_IDLE: @@ -1346,18 +1348,18 @@ static void alps_process_packet_ss4_v2(struct psmouse *psmouse) priv->multi_packet = 0; - alps_report_mt_data(psmouse, (f->fingers <= 4) ? f->fingers : 4); + if ((packet[3] & 0x30) != 0x20) { + alps_report_mt_data(psmouse, (f->fingers <= 4) ? f->fingers : 4); - input_mt_report_finger_count(dev, f->fingers); + input_mt_report_finger_count(dev, f->fingers); - input_report_key(dev, BTN_LEFT, f->left); - input_report_key(dev, BTN_RIGHT, f->right); - input_report_key(dev, BTN_MIDDLE, f->middle); + input_report_key(dev, BTN_LEFT, f->left); + input_report_key(dev, BTN_RIGHT, f->right); + input_report_key(dev, BTN_MIDDLE, f->middle); - input_report_abs(dev, ABS_PRESSURE, f->pressure); - input_sync(dev); - - if (priv->flags & ALPS_DUALPOINT) { + input_report_abs(dev, ABS_PRESSURE, f->pressure); + input_sync(dev); + } else if (priv->flags & ALPS_DUALPOINT) { input_report_key(dev2, BTN_LEFT, f->ts_left); input_report_key(dev2, BTN_RIGHT, f->ts_right); input_report_key(dev2, BTN_MIDDLE, f->ts_middle);