Skip to content

Commit

Permalink
Input: Revert "Revert "synaptics - use dmax in input_mt_assign_slots""
Browse files Browse the repository at this point in the history
This reverts commit 09d042a ("Revert "Input: synaptics - use dmax in
input_mt_assign_slots"")

Now that balanced slots assignments seem to be fixed, let's re-enable the
use in synaptics.c and wait for users to complain if there are still
problems.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Henrik Rydberg <rydberg@bitmath.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Benjamin Tissoires authored and Dmitry Torokhov committed Apr 6, 2015
1 parent 73e8a8e commit 58fd9af
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/input/mouse/synaptics.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
#define X_MAX_POSITIVE 8176
#define Y_MAX_POSITIVE 8176

/* maximum ABS_MT_POSITION displacement (in mm) */
#define DMAX 10

/*****************************************************************************
* Stuff we need even when we do not want native Synaptics support
****************************************************************************/
Expand Down Expand Up @@ -917,7 +920,7 @@ static void synaptics_report_mt_data(struct psmouse *psmouse,
pos[i].y = synaptics_invert_y(hw[i]->y);
}

input_mt_assign_slots(dev, slot, pos, nsemi, 0);
input_mt_assign_slots(dev, slot, pos, nsemi, DMAX * priv->x_res);

for (i = 0; i < nsemi; i++) {
input_mt_slot(dev, slot[i]);
Expand Down

0 comments on commit 58fd9af

Please sign in to comment.