diff options
| author | Dmitry Torokhov <dtor@chromium.org> | 2014-07-26 02:12:12 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-08 08:37:08 +0200 |
| commit | ae84197f8a5e29d9b949fb515493d05bf7723f5c (patch) | |
| tree | e61a2cbf81c859ed5864b1c1fbcd8093156d8f21 | |
| parent | Input: MT - make slot cleanup callable outside mt_sync_frame() (diff) | |
| download | linux-ae84197f8a5e29d9b949fb515493d05bf7723f5c.tar.xz linux-ae84197f8a5e29d9b949fb515493d05bf7723f5c.zip | |
Input: synaptics - properly initialize slots for semi-MT
Semi-MT devices are pointers too, so let's tell that to
input_mt_init_slots(), as well as let it set up the devices as semi-MT,
instead of us doing it manually.
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index ec772d962f06..f0142f215475 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -1370,11 +1370,11 @@ static void set_input_params(struct psmouse *psmouse, __set_bit(BTN_TOOL_QUADTAP, dev->keybit); __set_bit(BTN_TOOL_QUINTTAP, dev->keybit); } else if (SYN_CAP_ADV_GESTURE(priv->ext_cap_0c)) { - /* Non-image sensors with AGM use semi-mt */ - __set_bit(INPUT_PROP_SEMI_MT, dev->propbit); - input_mt_init_slots(dev, 2, 0); set_abs_position_params(dev, priv, ABS_MT_POSITION_X, ABS_MT_POSITION_Y); + /* Non-image sensors with AGM use semi-mt */ + input_mt_init_slots(dev, 2, + INPUT_MT_POINTER | INPUT_MT_SEMI_MT); } if (SYN_CAP_PALMDETECT(priv->capabilities)) |