lkml.org 
[lkml]   [2017]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 20/88] Input: ALPS - fix trackstick button handling on V8 devices
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Masaki Ota <masaki.ota@jp.alps.com>

    commit 47e6fb4212d09f325c0847d05985dd3d71553095 upstream.

    Alps stick devices always have physical buttons, so we should not check
    ALPS_BUTTONPAD flag to decide whether we should report them.

    Fixes: 4777ac220c43 ("Input: ALPS - add touchstick support for SS5 hardware")
    Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com>
    Acked-by: Pali Rohar <pali.rohar@gmail.com>
    Tested-by: Paul Donohue <linux-kernel@PaulSD.com>
    Tested-by: Nick Fletcher <nick.m.fletcher@gmail.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/input/mouse/alps.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    --- a/drivers/input/mouse/alps.c
    +++ b/drivers/input/mouse/alps.c
    @@ -1290,10 +1290,8 @@ static int alps_decode_ss4_v2(struct alp
    /* 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)) {

    \
     
     \ /
      Last update: 2017-03-28 15:12    [W:4.608 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site