Input: alps - v7: fix finger counting for > 2 fingers on clickpads

Protocol v7 uses the middle / right button bits on clickpads to communicate
"location" information of a 3th touch (and possible 4th) touch on
clickpads.

Specifically when 3 touches are down, if one of the 3 touches is in the
left / right button area, this will get reported in the middle / right
button bits and the touchpad will still send a TWO type packet rather then
a MULTI type packet, so when this happens we must add the finger reported
in the button area to the finger count.

Likewise we must also add fingers reported this way to the finger count
when we get MULTI packets.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=86338
Cc: stable@vger.kernel.org # 3.17
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index bfa62a63942f4ca8d5359c2fa090d94d8a60926f..b48c6fb317edb89edccc4ffbf1ec14360f7751eb 100644 (file)
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -933,6 +933,7 @@ static int alps_decode_packet_v7(struct alps_fields *f,
                                  unsigned char *p,
                                  struct psmouse *psmouse)
 {
+       struct alps_data *priv = psmouse->private;
        unsigned char pkt_id;
 
        pkt_id = alps_get_packet_id_v7(p);
@@ -963,15 +964,22 @@ static int alps_decode_packet_v7(struct alps_fields *f,
 
        alps_get_finger_coordinate_v7(f->mt, p, pkt_id);
 
-       f->left = (p[0] & 0x80) >> 7;
-       f->right = (p[0] & 0x20) >> 5;
-       f->middle = (p[0] & 0x10) >> 4;
-
        if (pkt_id == V7_PACKET_ID_TWO)
                f->fingers = alps_get_mt_count(f->mt);
        else /* pkt_id == V7_PACKET_ID_MULTI */
                f->fingers = 3 + (p[5] & 0x03);
 
+       f->left = (p[0] & 0x80) >> 7;
+       if (priv->flags & ALPS_BUTTONPAD) {
+               if (p[0] & 0x20)
+                       f->fingers++;
+               if (p[0] & 0x10)
+                       f->fingers++;
+       } else {
+               f->right = (p[0] & 0x20) >> 5;
+               f->middle = (p[0] & 0x10) >> 4;
+       }
+
        /* Sometimes a single touch is reported in mt[1] rather then mt[0] */
        if (f->fingers == 1 && f->mt[0].x == 0 && f->mt[0].y == 0) {
                f->mt[0].x = f->mt[1].x;