]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Input: synaptics - properly initialize slots for semi-MT
authorDmitry Torokhov <dtor@chromium.org>
Sat, 26 Jul 2014 00:12:12 +0000 (17:12 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 8 Aug 2014 06:37:08 +0000 (23:37 -0700)
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>
drivers/input/mouse/synaptics.c

index ec772d962f06800fc92915fa27d51b25fca1e56f..f0142f215475f170998590816d33f069b64fac46 100644 (file)
@@ -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))