From patchwork Tue Nov 8 14:54:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donohue X-Patchwork-Id: 9417611 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 8DB0460512 for ; Tue, 8 Nov 2016 14:54:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F64C2856B for ; Tue, 8 Nov 2016 14:54:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71A2728833; Tue, 8 Nov 2016 14:54:28 +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 5EDFD2856B for ; Tue, 8 Nov 2016 14:54:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751296AbcKHOy0 (ORCPT ); Tue, 8 Nov 2016 09:54:26 -0500 Received: from Lepton.TopQuark.net ([168.235.66.66]:40761 "EHLO Mail2.TopQuark.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751266AbcKHOyZ (ORCPT ); Tue, 8 Nov 2016 09:54:25 -0500 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 E9F1CF60282; Tue, 8 Nov 2016 09:54:23 -0500 (EST) Received: from Mail1.TopQuark.net (unknown [127.0.0.1]) by Mail1.TopQuark.net (Postfix) with ESMTP id 746A927EE0DE; Tue, 8 Nov 2016 09:54:23 -0500 (EST) 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=aLtwhrAySfj5Knf6qmcL3FJgh3Q=; b=e1ic+3z 4QZ7pOUd7Rh5SNPxYg8wGqhcl/vxKGzBxfTh2t8oKVUL34wSGmRy0K57Quscv9bg USn15YXvD+XrczY3M0i/fxb0QDsSu5E6w1mhM/rVP+Ar3JpyYsJNPXGXBaQO8Q+y M2O9UvQlhR9iftCALgIy/U8iiZqjvx+vzyTc= Received: by Mail1.TopQuark.net (Postfix, from userid 1000) id 50A5927EE34E; Tue, 8 Nov 2016 09:54:23 -0500 (EST) Date: Tue, 8 Nov 2016 09:54:23 -0500 From: Paul Donohue To: linux-input@vger.kernel.org Cc: Ben Gamari , Pali =?iso-8859-1?Q?Roh=E1r?= , Michal Hocko Subject: [PATCH v3 1/3] Input: ALPS - Fix TrackStick support for SS5 hardware Message-ID: <20161108145423.GK2927@TopQuark.net> References: <20161024210122.GA2919@TopQuark.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161024210122.GA2919@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 Input: ALPS - Fix TrackStick support for SS5 hardware 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..b93fe83 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -1346,6 +1346,18 @@ static void alps_process_packet_ss4_v2(struct psmouse *psmouse) priv->multi_packet = 0; + /* Report trackstick */ + if (alps_get_pkt_id_ss4_v2(packet) == SS4_PACKET_ID_STICK) { + 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); + input_sync(dev2); + } + return; + } + + /* Report touchpad */ alps_report_mt_data(psmouse, (f->fingers <= 4) ? f->fingers : 4); input_mt_report_finger_count(dev, f->fingers); @@ -1356,13 +1368,6 @@ static void alps_process_packet_ss4_v2(struct psmouse *psmouse) input_report_abs(dev, ABS_PRESSURE, f->pressure); input_sync(dev); - - 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); - input_sync(dev2); - } } static bool alps_is_valid_package_ss4_v2(struct psmouse *psmouse)