aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@chromium.org>2014-07-25 20:12:12 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-08-08 02:37:08 -0400
commitae84197f8a5e29d9b949fb515493d05bf7723f5c (patch)
treee61a2cbf81c859ed5864b1c1fbcd8093156d8f21 /drivers/input
parentf8ec894945e7d205ce62be59e55e72c4304e4739 (diff)
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')
-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 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,
1370 __set_bit(BTN_TOOL_QUADTAP, dev->keybit); 1370 __set_bit(BTN_TOOL_QUADTAP, dev->keybit);
1371 __set_bit(BTN_TOOL_QUINTTAP, dev->keybit); 1371 __set_bit(BTN_TOOL_QUINTTAP, dev->keybit);
1372 } else if (SYN_CAP_ADV_GESTURE(priv->ext_cap_0c)) { 1372 } else if (SYN_CAP_ADV_GESTURE(priv->ext_cap_0c)) {
1373 /* Non-image sensors with AGM use semi-mt */
1374 __set_bit(INPUT_PROP_SEMI_MT, dev->propbit);
1375 input_mt_init_slots(dev, 2, 0);
1376 set_abs_position_params(dev, priv, ABS_MT_POSITION_X, 1373 set_abs_position_params(dev, priv, ABS_MT_POSITION_X,
1377 ABS_MT_POSITION_Y); 1374 ABS_MT_POSITION_Y);
1375 /* Non-image sensors with AGM use semi-mt */
1376 input_mt_init_slots(dev, 2,
1377 INPUT_MT_POINTER | INPUT_MT_SEMI_MT);
1378 } 1378 }
1379 1379
1380 if (SYN_CAP_PALMDETECT(priv->capabilities)) 1380 if (SYN_CAP_PALMDETECT(priv->capabilities))