leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: alps - process_bitmap: round down when spreading adjescent fingers over 2 points

Browse Source 
This fixes 2 fingers at the same height or width on the touchpad getting
reported at different y / x coordinates.

Note num_bits is always at least 1.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Hans de Goede 2014-07-25 22:42:53 -07:00 committed by Dmitry Torokhov
parent 105affbfd5
commit 28835f4540
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/mouse/alps.c
View File

@ -391,13 +391,13 @@ static int alps_process_bitmap(struct alps_data *priv,
* adjacent fingers. Divide the single contact between the two points. * adjacent fingers. Divide the single contact between the two points.
*/ */
if (fingers_x == 1) { if (fingers_x == 1) {
i = x_low.num_bits / 2; i = (x_low.num_bits - 1) / 2;
x_low.num_bits = x_low.num_bits - i; x_low.num_bits = x_low.num_bits - i;
x_high.start_bit = x_low.start_bit + i; x_high.start_bit = x_low.start_bit + i;
x_high.num_bits = max(i, 1); x_high.num_bits = max(i, 1);
} }
if (fingers_y == 1) { if (fingers_y == 1) {
i = y_low.num_bits / 2; i = (y_low.num_bits - 1) / 2;
y_low.num_bits = y_low.num_bits - i; y_low.num_bits = y_low.num_bits - i;
y_high.start_bit = y_low.start_bit + i; y_high.start_bit = y_low.start_bit + i;
y_high.num_bits = max(i, 1); y_high.num_bits = max(i, 1);