summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorLucas Stach2017-01-16 00:23:05 +0100
committerDmitry Torokhov2017-01-16 00:41:00 +0100
commit630a7fa0480bec63e0a300b8485642630340efcf (patch)
tree8173958ed106d86938cfbe84aed43b367c64fe83 /drivers/input
parentInput: synaptics-rmi4 - remove redundant null check on rmi_dev (diff)
downloadkernel-qcow2-linux-630a7fa0480bec63e0a300b8485642630340efcf.tar.gz
kernel-qcow2-linux-630a7fa0480bec63e0a300b8485642630340efcf.tar.xz
kernel-qcow2-linux-630a7fa0480bec63e0a300b8485642630340efcf.zip
Input: synaptics-rmi4 - correctly swap clip values if axes are swapped
The clip values need the same swapping as the maximum values if the sensor axes are swapped. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/rmi4/rmi_2d_sensor.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/input/rmi4/rmi_2d_sensor.c b/drivers/input/rmi4/rmi_2d_sensor.c
index 07007ff8e29f..8bb866c7b985 100644
--- a/drivers/input/rmi4/rmi_2d_sensor.c
+++ b/drivers/input/rmi4/rmi_2d_sensor.c
@@ -144,8 +144,13 @@ static void rmi_2d_sensor_set_input_params(struct rmi_2d_sensor *sensor)
int input_flags = 0;
if (sensor->report_abs) {
- if (sensor->axis_align.swap_axes)
+ if (sensor->axis_align.swap_axes) {
swap(sensor->max_x, sensor->max_y);
+ swap(sensor->axis_align.clip_x_low,
+ sensor->axis_align.clip_y_low);
+ swap(sensor->axis_align.clip_x_high,
+ sensor->axis_align.clip_y_high);
+ }
sensor->min_x = sensor->axis_align.clip_x_low;
if (sensor->axis_align.clip_x_high)