summaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/synaptics.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@chromium.org>2014-07-25 17:12:12 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-08-07 23:37:08 -0700
commitae84197f8a5e29d9b949fb515493d05bf7723f5c (patch)
treee61a2cbf81c859ed5864b1c1fbcd8093156d8f21 /drivers/input/mouse/synaptics.c
parentf8ec894945e7d205ce62be59e55e72c4304e4739 (diff)
downloadop-kernel-dev-ae84197f8a5e29d9b949fb515493d05bf7723f5c.zip
op-kernel-dev-ae84197f8a5e29d9b949fb515493d05bf7723f5c.tar.gz
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>
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
-rw-r--r--drivers/input/mouse/synaptics.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index ec772d9..f0142f2 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))
OpenPOWER on IntegriCloud