From cbcadbefa3ef2141e109c27cd8d93b54c907842a Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Fri, 15 Feb 2013 17:04:03 -0800 Subject: [PATCH] --- yaml --- r: 350712 b: refs/heads/master c: 0b85bf78d4aedfdd4bcb1b848045111a5b840310 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/synaptics.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a5b2f11d7826..217aaf8f1da6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 352ce2b0575f195c8e6452a9802e6c186b39409a +refs/heads/master: 0b85bf78d4aedfdd4bcb1b848045111a5b840310 diff --git a/trunk/drivers/input/mouse/synaptics.c b/trunk/drivers/input/mouse/synaptics.c index c3d1c86ac591..2f78538e09d0 100644 --- a/trunk/drivers/input/mouse/synaptics.c +++ b/trunk/drivers/input/mouse/synaptics.c @@ -1271,11 +1271,11 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv) input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0); if (SYN_CAP_IMAGE_SENSOR(priv->ext_cap_0c)) { - input_mt_init_slots(dev, 2, 0); set_abs_position_params(dev, priv, ABS_MT_POSITION_X, ABS_MT_POSITION_Y); /* Image sensors can report per-contact pressure */ input_set_abs_params(dev, ABS_MT_PRESSURE, 0, 255, 0, 0); + input_mt_init_slots(dev, 2, INPUT_MT_POINTER); /* Image sensors can signal 4 and 5 finger clicks */ __set_bit(BTN_TOOL_QUADTAP, dev->keybit);