diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-05-25 21:24:42 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-05-25 21:24:42 +0300 |
commit | cbb245239282870bc6f54d5137dfe0f84b48ea72 (patch) | |
tree | dcdd8041d7bb5cddacfe086785dd370aa1a7a6ea /drivers/input/touchscreen/s6sy761.c | |
parent | 94a332bd8626f6c32e7ba5835dd17eeddbb76e89 (diff) | |
parent | 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 (diff) | |
download | linux-cbb245239282870bc6f54d5137dfe0f84b48ea72.tar.xz |
Merge tag 'v5.12' into next
Sync up with mainline to get the latest device tree bindings and kernel
APIs.
Diffstat (limited to 'drivers/input/touchscreen/s6sy761.c')
-rw-r--r-- | drivers/input/touchscreen/s6sy761.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/s6sy761.c b/drivers/input/touchscreen/s6sy761.c index b63d7fdf0cd2..85a1f465c097 100644 --- a/drivers/input/touchscreen/s6sy761.c +++ b/drivers/input/touchscreen/s6sy761.c @@ -145,8 +145,8 @@ static void s6sy761_report_coordinates(struct s6sy761_data *sdata, u8 major = event[4]; u8 minor = event[5]; u8 z = event[6] & S6SY761_MASK_Z; - u16 x = (event[1] << 3) | ((event[3] & S6SY761_MASK_X) >> 4); - u16 y = (event[2] << 3) | (event[3] & S6SY761_MASK_Y); + u16 x = (event[1] << 4) | ((event[3] & S6SY761_MASK_X) >> 4); + u16 y = (event[2] << 4) | (event[3] & S6SY761_MASK_Y); input_mt_slot(sdata->input, tid); |