2 files changed, 19 insertions, 14 deletions

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 579b899add26..dbe57da8c1a1 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1250,29 +1250,32 @@ static int alps_decode_ss4_v2(struct alps_fields *f,
         case SS4_PACKET_ID_MULTI:
                 if (priv->flags & ALPS_BUTTONPAD) {
                         if (IS_SS4PLUS_DEV(priv->dev_id)) {
-                                f->mt[0].x = SS4_PLUS_BTL_MF_X_V2(p, 0);
-                                f->mt[1].x = SS4_PLUS_BTL_MF_X_V2(p, 1);
+                                f->mt[2].x = SS4_PLUS_BTL_MF_X_V2(p, 0);
+                                f->mt[3].x = SS4_PLUS_BTL_MF_X_V2(p, 1);
+                                no_data_x = SS4_PLUS_MFPACKET_NO_AX_BL;
                         } else {
                                 f->mt[2].x = SS4_BTL_MF_X_V2(p, 0);
                                 f->mt[3].x = SS4_BTL_MF_X_V2(p, 1);
+                                no_data_x = SS4_MFPACKET_NO_AX_BL;
                         }
+                        no_data_y = SS4_MFPACKET_NO_AY_BL;
 
                         f->mt[2].y = SS4_BTL_MF_Y_V2(p, 0);
                         f->mt[3].y = SS4_BTL_MF_Y_V2(p, 1);
-                        no_data_x = SS4_MFPACKET_NO_AX_BL;
-                        no_data_y = SS4_MFPACKET_NO_AY_BL;
                 } else {
                         if (IS_SS4PLUS_DEV(priv->dev_id)) {
-                                f->mt[0].x = SS4_PLUS_STD_MF_X_V2(p, 0);
-                                f->mt[1].x = SS4_PLUS_STD_MF_X_V2(p, 1);
+                                f->mt[2].x = SS4_PLUS_STD_MF_X_V2(p, 0);
+                                f->mt[3].x = SS4_PLUS_STD_MF_X_V2(p, 1);
+                                no_data_x = SS4_PLUS_MFPACKET_NO_AX;
                         } else {
-                                f->mt[0].x = SS4_STD_MF_X_V2(p, 0);
-                                f->mt[1].x = SS4_STD_MF_X_V2(p, 1);
+                                f->mt[2].x = SS4_STD_MF_X_V2(p, 0);
+                                f->mt[3].x = SS4_STD_MF_X_V2(p, 1);
+                                no_data_x = SS4_MFPACKET_NO_AX;
                         }
+                        no_data_y = SS4_MFPACKET_NO_AY;
+
                         f->mt[2].y = SS4_STD_MF_Y_V2(p, 0);
                         f->mt[3].y = SS4_STD_MF_Y_V2(p, 1);
-                        no_data_x = SS4_MFPACKET_NO_AX;
-                        no_data_y = SS4_MFPACKET_NO_AY;
                 }
 
                 f->first_mp = 0;
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index c80a7c76cb76..79b6d69d1486 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -141,10 +141,12 @@ enum SS4_PACKET_ID {
 #define SS4_TS_Z_V2(_b)         (s8)(_b[4] & 0x7F)
 
 
-#define SS4_MFPACKET_NO_AX      8160    /* X-Coordinate value */
-#define SS4_MFPACKET_NO_AY      4080    /* Y-Coordinate value */
-#define SS4_MFPACKET_NO_AX_BL   8176    /* Buttonless X-Coordinate value */
-#define SS4_MFPACKET_NO_AY_BL   4088    /* Buttonless Y-Coordinate value */
+#define SS4_MFPACKET_NO_AX              8160    /* X-Coordinate value */
+#define SS4_MFPACKET_NO_AY              4080    /* Y-Coordinate value */
+#define SS4_MFPACKET_NO_AX_BL           8176    /* Buttonless X-Coord value */
+#define SS4_MFPACKET_NO_AY_BL           4088    /* Buttonless Y-Coord value */
+#define SS4_PLUS_MFPACKET_NO_AX         4080    /* SS4 PLUS, X */
+#define SS4_PLUS_MFPACKET_NO_AX_BL      4088    /* Buttonless SS4 PLUS, X */
 
 /*
  * enum V7_PACKET_ID - defines the packet type for V7