From patchwork Tue Mar 14 01:34:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masaki Ota <012nexus@gmail.com> X-Patchwork-Id: 9622407 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 633CA60522 for ; Tue, 14 Mar 2017 01:34:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AA1827FBB for ; Tue, 14 Mar 2017 01:34:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 356B228512; Tue, 14 Mar 2017 01:34: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=-5.5 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,FROM_STARTS_WITH_NUMS,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM,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 D91CD283E8 for ; Tue, 14 Mar 2017 01:34:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752877AbdCNBeZ (ORCPT ); Mon, 13 Mar 2017 21:34:25 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:33458 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754041AbdCNBeW (ORCPT ); Mon, 13 Mar 2017 21:34:22 -0400 Received: by mail-pg0-f68.google.com with SMTP id 77so20722756pgc.0; Mon, 13 Mar 2017 18:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aDICSeK41K0/GFFaKXriQVUy4qtRQTLwymtS/f6cizk=; b=AEuefADnB0HzXe+ZtCuZ41jzr0UHXudD45KHp8YZahOZKb0x0JUzodSSZ2HMpiH+Pm npt/foVyJ2u9oLEMrx4K/3mjAymOAJqKQaSOdk1fsITQ/kA/i4Cz+K5M41kBMojnzNit 9iwUx+d9scF2rXPsFDoXp8Kjupi8Q4/Jido3TrB7me9KGmeAcrqLrPfxkS2TO9BJKRd+ NPhbSZLfzRYuleS2CCaBOYv2mISPRCYOwRJN4IWze5T2lKmRJ5r39Sz7+EK3kVuj9kgQ 6YIUm7GePdcGvxv0gu+RBtLANN8ieRU+uqMSyJvgBbXh+0TtfFlc+EbHhB9wZUMYWEZi Mdhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aDICSeK41K0/GFFaKXriQVUy4qtRQTLwymtS/f6cizk=; b=PXyc2fzoj8d53alqZ12qgwRbPcDjAewV1wNSQscsEuYPzDjF/H3azb/P/ANtJ4rDnA kRE/Jtrz8GcGmtmexafrmWGIOJmrEslbcbHjEKwaNOfqss+rRwo/tABQzlR8Q2OE0l/H 3xzrGtGd8Uxtzm1WPG4pNW6s2xsblmsDiMZs+OfVrWg8Ueg0TvE7/y+lWcB9R5Acq1EB dZx1IJIphrbILtX3Dzq04fZ3AmM1Js838Zbux/33Lf6sIFiiW09txjlz/ZnVoMs/JgJD wockRnfQnme8A3hrerENVYmJeTv79rQCnfqmuJx2uxyNbmdnwdfxDdwr8ftkuBM42gwf UrYg== X-Gm-Message-State: AMke39nXQxXQZp8Zr3ttdb6TpiwPu/ZsiT9llb1FnppwcFPK6e7dkwcDWOjIYoLtBnnAqA== X-Received: by 10.84.138.1 with SMTP id 1mr52279200plo.29.1489455261343; Mon, 13 Mar 2017 18:34:21 -0700 (PDT) Received: from localhost (p2239-ipad303aobadori.miyagi.ocn.ne.jp. [123.216.73.239]) by smtp.gmail.com with ESMTPSA id g21sm34822629pfb.41.2017.03.13.18.34.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Mar 2017 18:34:20 -0700 (PDT) From: Masaki Ota <012nexus@gmail.com> X-Google-Original-From: Masaki Ota To: dmitry.torokhov@gmail.com, linux-kernel@paulsd.com, nick.m.fletcher@gmail.com Cc: joseph.salisbury@canonical.com, ben@smart-cactus.org, mhocko@suse.com, pali.rohar@gmail.com, rydberg@bitmath.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, masaki.ota@jp.alps.com Subject: [PATCH 2/2] Fix the issue that V8 Button pad Stick button does not work Date: Tue, 14 Mar 2017 10:34:13 +0900 Message-Id: <20170314013413.7260-2-masaki.ota@jp.alps.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170314013413.7260-1-masaki.ota@jp.alps.com> References: <20170314013413.7260-1-masaki.ota@jp.alps.com> 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 From: Masaki Ota - V8 Button pad Stick Right and Middle button don't work. - Alps stick devices have physical buttons absolutely, so delete "ALPS_BUTTONPAD" check Flag from Stick button process. Signed-off-by: Masaki Ota Acked-by: Pali Rohar Tested-by: Paul Donohue --- drivers/input/mouse/alps.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 253f742..262d105 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -1287,10 +1287,8 @@ static int alps_decode_ss4_v2(struct alps_fields *f, /* handle buttons */ if (pkt_id == SS4_PACKET_ID_STICK) { f->ts_left = !!(SS4_BTN_V2(p) & 0x01); - if (!(priv->flags & ALPS_BUTTONPAD)) { - f->ts_right = !!(SS4_BTN_V2(p) & 0x02); - f->ts_middle = !!(SS4_BTN_V2(p) & 0x04); - } + f->ts_right = !!(SS4_BTN_V2(p) & 0x02); + f->ts_middle = !!(SS4_BTN_V2(p) & 0x04); } else { f->left = !!(SS4_BTN_V2(p) & 0x01); if (!(priv->flags & ALPS_BUTTONPAD)) {