diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-07 01:17:39 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-07 01:17:39 +0300 |
| commit | d5e6e0fa442a479e27dfb7d17aeef1260dc19b09 (patch) | |
| tree | b0a3d1b6c32335b009493d79b30f8e59ed60f269 /drivers/input/rmi4/rmi_2d_sensor.c | |
| parent | 57b8443d3e5bd046a519ff714ca31c64c7f04309 (diff) | |
| parent | f32361b71ae5c81b8fb96f796ab947ba2ad17aa8 (diff) | |
| download | linux-d5e6e0fa442a479e27dfb7d17aeef1260dc19b09.tar.xz | |
Merge branch 'synaptics-rmi4' into next
Bring in latest RMI4 support in preparation to the merge window.
Diffstat (limited to 'drivers/input/rmi4/rmi_2d_sensor.c')
| -rw-r--r-- | drivers/input/rmi4/rmi_2d_sensor.c | 7 |
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) |