diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-11-29 22:34:28 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-11-29 22:34:28 +0300 |
| commit | b746a1a2860f4a918f32d10dc569115d282aaf2f (patch) | |
| tree | 4b30e6ff28e2783c73a1b763e819f5b41414563c /drivers/input/touchscreen/st1232.c | |
| parent | 8725aa4fa7ded30211ebd28bb1c9bae806eb3841 (diff) | |
| parent | b03e5774d51fe003e1020060c403a1d085b128eb (diff) | |
| download | linux-b746a1a2860f4a918f32d10dc569115d282aaf2f.tar.xz | |
Merge branch 'for-5.5/core' into for-linus
- hid_have_special_driver[] cleanup for LED devices (Heiner Kallweit)
- HID parser improvements (Blaž Hrastnik, Candle Sun)
Diffstat (limited to 'drivers/input/touchscreen/st1232.c')
| -rw-r--r-- | drivers/input/touchscreen/st1232.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c index 34923399ece4..1139714e72e2 100644 --- a/drivers/input/touchscreen/st1232.c +++ b/drivers/input/touchscreen/st1232.c @@ -81,8 +81,10 @@ static int st1232_ts_read_data(struct st1232_ts_data *ts) for (i = 0, y = 0; i < ts->chip_info->max_fingers; i++, y += 3) { finger[i].is_valid = buf[i + y] >> 7; if (finger[i].is_valid) { - finger[i].x = ((buf[i + y] & 0x0070) << 4) | buf[i + 1]; - finger[i].y = ((buf[i + y] & 0x0007) << 8) | buf[i + 2]; + finger[i].x = ((buf[i + y] & 0x0070) << 4) | + buf[i + y + 1]; + finger[i].y = ((buf[i + y] & 0x0007) << 8) | + buf[i + y + 2]; /* st1232 includes a z-axis / touch strength */ if (ts->chip_info->have_z) |