--- v5
+++ v4
@@ -13,10 +13,10 @@
  1 files changed, 44 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index a5bc469..01d7db3 100644
+index 3840cc7..4e9bc4a 100644
 --- a/drivers/input/mouse/synaptics.c
 +++ b/drivers/input/mouse/synaptics.c
-@@ -762,6 +762,10 @@ static void synaptics_image_sensor_1f(struct synaptics_data *priv,
+@@ -739,6 +739,10 @@ static void synaptics_image_sensor_1f(struct synaptics_data *priv,
  		synaptics_mt_state_set(mt_state, 1, -1, -1);
  		priv->mt_state_lost = true;
  		break;
@@ -27,7 +27,7 @@
  	}
  }
  
-@@ -816,6 +820,10 @@ static void synaptics_image_sensor_2f(struct synaptics_data *priv,
+@@ -793,6 +797,10 @@ static void synaptics_image_sensor_2f(struct synaptics_data *priv,
  		synaptics_mt_state_set(mt_state, 2, -1, -1);
  		priv->mt_state_lost = true;
  		break;
@@ -38,7 +38,7 @@
  	}
  }
  
-@@ -844,6 +852,22 @@ static void synaptics_image_sensor_3f(struct synaptics_data *priv,
+@@ -821,6 +829,22 @@ static void synaptics_image_sensor_3f(struct synaptics_data *priv,
  		break;
  	case 2:
  		/*
@@ -61,7 +61,7 @@
  		 * After some 3->1 and all 3->2 transitions, we lose track
  		 * of which slot is reported by SGM and AGM.
  		 *
-@@ -883,9 +907,22 @@ static void synaptics_image_sensor_3f(struct synaptics_data *priv,
+@@ -860,9 +884,22 @@ static void synaptics_image_sensor_3f(struct synaptics_data *priv,
  		 * received AGM-CONTACT packet.
  		 */
  		break;
@@ -84,7 +84,7 @@
  static void synaptics_image_sensor_process(struct psmouse *psmouse,
  					   struct synaptics_hw_state *sgm)
  {
-@@ -905,8 +942,10 @@ static void synaptics_image_sensor_process(struct psmouse *psmouse,
+@@ -882,8 +919,10 @@ static void synaptics_image_sensor_process(struct psmouse *psmouse,
  		synaptics_image_sensor_1f(priv, &mt_state);
  	else if (sgm->w == 0)
  		synaptics_image_sensor_2f(priv, &mt_state);
@@ -96,7 +96,7 @@
  
  	/* Send resulting input events to user space */
  	synaptics_report_mt_data(psmouse, &mt_state, sgm);
-@@ -1110,6 +1149,10 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
+@@ -1100,6 +1139,10 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
  					ABS_MT_POSITION_Y);
  		/* Image sensors can report per-contact pressure */
  		input_set_abs_params(dev, ABS_MT_PRESSURE, 0, 255, 0, 0);