diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-12 12:20:36 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-12 12:20:36 +0800 |
| commit | e37ddf27108a992e191b27df9bd532cb9157dc89 (patch) | |
| tree | dd86e72414ae0b235679a992dfd408cc19fd2ab6 /drivers/input | |
| parent | 9ba733e2628196c5f211875122c8fc6de108c19e (diff) | |
| parent | 4c2795dd50f98fa162cb53190eb557be44f92f58 (diff) | |
Merge tag 'v4.4.10' into linux-linaro-lsk-v4.4
This is the 4.4.10 stable release
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/zforce_ts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c index 9bbadaaf6bc3..7b3845aa5983 100644 --- a/drivers/input/touchscreen/zforce_ts.c +++ b/drivers/input/touchscreen/zforce_ts.c @@ -370,8 +370,8 @@ static int zforce_touch_event(struct zforce_ts *ts, u8 *payload) point.coord_x = point.coord_y = 0; } - point.state = payload[9 * i + 5] & 0x03; - point.id = (payload[9 * i + 5] & 0xfc) >> 2; + point.state = payload[9 * i + 5] & 0x0f; + point.id = (payload[9 * i + 5] & 0xf0) >> 4; /* determine touch major, minor and orientation */ point.area_major = max(payload[9 * i + 6], |