Input: alps - decode the position packet first

We should decode the position packet before the packet with the bitmap
data.  This way we can use the more accurate position info in
process_bitmap() to get better results.

Signed-off-by: Hans de Goede <hdegoede@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 942ee08ce6b4a5759cae01c074c319f22f4e4fd4..d1488db6d149398723feedf1c3ee892a8a00edfe 100644 (file)
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -688,24 +688,17 @@ static void alps_process_touchpad_packet_v3_v5(struct psmouse *psmouse)
                 */
                if (f->is_mp) {
                        fingers = f->fingers;
+                       /*
+                        * Bitmap processing uses position packet's coordinate
+                        * data, so we need to do decode it first.
+                        */
+                       priv->decode_fields(f, priv->multi_data, psmouse);
+
                        if (priv->proto_version == ALPS_PROTO_V3 ||
                            priv->proto_version == ALPS_PROTO_V3_RUSHMORE) {
                                if (alps_process_bitmap(priv, f) == 0)
                                        fingers = 0; /* Use st data */
-
-                               /* Now process position packet */
-                               priv->decode_fields(f, priv->multi_data,
-                                                   psmouse);
                        } else {
-                               /*
-                                * Because Dolphin uses position packet's
-                                * coordinate data as Pt1 and uses it to
-                                * calculate Pt2, so we need to do position
-                                * packet decode first.
-                                */
-                               priv->decode_fields(f, priv->multi_data,
-                                                   psmouse);
-
                                /*
                                 * Since Dolphin's finger number is reliable,
                                 * there is no need to compare with bmap_fn.
@@ -873,6 +866,14 @@ static void alps_process_packet_v4(struct psmouse *psmouse)
        priv->multi_data[offset] = packet[6];
        priv->multi_data[offset + 1] = packet[7];
 
+       f->left = !!(packet[4] & 0x01);
+       f->right = !!(packet[4] & 0x02);
+
+       f->st.x = ((packet[1] & 0x7f) << 4) | ((packet[3] & 0x30) >> 2) |
+                 ((packet[0] & 0x30) >> 4);
+       f->st.y = ((packet[2] & 0x7f) << 4) | (packet[3] & 0x0f);
+       f->pressure = packet[5] & 0x7f;
+
        if (++priv->multi_packet > 2) {
                priv->multi_packet = 0;
 
@@ -887,14 +888,6 @@ static void alps_process_packet_v4(struct psmouse *psmouse)
                f->fingers = alps_process_bitmap(priv, f);
        }
 
-       f->left = !!(packet[4] & 0x01);
-       f->right = !!(packet[4] & 0x02);
-
-       f->st.x = ((packet[1] & 0x7f) << 4) | ((packet[3] & 0x30) >> 2) |
-                 ((packet[0] & 0x30) >> 4);
-       f->st.y = ((packet[2] & 0x7f) << 4) | (packet[3] & 0x0f);
-       f->pressure = packet[5] & 0x7f;
-
        alps_report_semi_mt_data(psmouse, f->fingers);
 }