[PATCH v1 1/2] input: rmi4: fix RMI_2D clipping

[Svyatoslav Ryhel <clamor95@gmail.com>]

From: Jonas Schwöbel <jonasschwoebel@yahoo.de>

The physical max_y value was overridden with a clip_y_max value. This
caused problems when inverting/flipping the screen. Further it messed up
calculation of resolution.

Signed-off-by: Jonas Schwöbel <jonasschwoebel@yahoo.de>
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
---
 drivers/input/rmi4/rmi_2d_sensor.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/input/rmi4/rmi_2d_sensor.c b/drivers/input/rmi4/rmi_2d_sensor.c
index b7fe6eb35a4e..b4762b3c8b24 100644
--- a/drivers/input/rmi4/rmi_2d_sensor.c
+++ b/drivers/input/rmi4/rmi_2d_sensor.c
@@ -56,7 +56,7 @@ void rmi_2d_sensor_abs_process(struct rmi_2d_sensor *sensor,
 		obj->x = min(sensor->max_x, obj->x);
 
 	if (axis_align->clip_y_high)
-		obj->y =  min(sensor->max_y, obj->y);
+		obj->y =  min(axis_align->clip_y_high, obj->y);
 
 	sensor->tracking_pos[slot].x = obj->x;
 	sensor->tracking_pos[slot].y = obj->y;
@@ -149,13 +149,12 @@ static void rmi_2d_sensor_set_input_params(struct rmi_2d_sensor *sensor)
 
 		sensor->min_y = sensor->axis_align.clip_y_low;
 		if (sensor->axis_align.clip_y_high)
-			sensor->max_y = min(sensor->max_y,
+			max_y = min(sensor->max_y,
 				sensor->axis_align.clip_y_high);
 
 		set_bit(EV_ABS, input->evbit);
 
 		max_x = sensor->max_x;
-		max_y = sensor->max_y;
 		if (sensor->axis_align.swap_axes)
 			swap(max_x, max_y);
 		input_set_abs_params(input, ABS_MT_POSITION_X, 0, max_x, 0, 0);
-- 
2.48.1