From ba166015f7d6e5c3892f501de10f0f1e0b0c83cf Mon Sep 17 00:00:00 2001 From: Chris Bagwell Date: Mon, 19 Jul 2010 09:06:15 -0700 Subject: [PATCH] --- yaml --- r: 202219 b: refs/heads/master c: 2a8e77102e02dd236ff276a2151073ed551d04f2 h: refs/heads/master i: 202217: ac4932873d9464aad9f9381a380080cafbace19c 202215: b128683b25e1cb18a2f91aec2f674625fa9180b8 v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/synaptics.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c622b372f26e..96a76225843a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c18fb1396eb809dbc16e51da273a1789f9d799bf +refs/heads/master: 2a8e77102e02dd236ff276a2151073ed551d04f2 diff --git a/trunk/drivers/input/mouse/synaptics.c b/trunk/drivers/input/mouse/synaptics.c index 40cea334ad13..1b49d7f8ae11 100644 --- a/trunk/drivers/input/mouse/synaptics.c +++ b/trunk/drivers/input/mouse/synaptics.c @@ -496,7 +496,9 @@ static void synaptics_process_packet(struct psmouse *psmouse) } input_report_abs(dev, ABS_PRESSURE, hw.z); - input_report_abs(dev, ABS_TOOL_WIDTH, finger_width); + if (SYN_CAP_PALMDETECT(priv->capabilities)) + input_report_abs(dev, ABS_TOOL_WIDTH, finger_width); + input_report_key(dev, BTN_TOOL_FINGER, num_fingers == 1); input_report_key(dev, BTN_LEFT, hw.left); input_report_key(dev, BTN_RIGHT, hw.right); @@ -596,7 +598,9 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv) input_set_abs_params(dev, ABS_Y, YMIN_NOMINAL, priv->y_max ?: YMAX_NOMINAL, 0, 0); input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0); - __set_bit(ABS_TOOL_WIDTH, dev->absbit); + + if (SYN_CAP_PALMDETECT(priv->capabilities)) + __set_bit(ABS_TOOL_WIDTH, dev->absbit); __set_bit(EV_KEY, dev->evbit); __set_bit(BTN_TOUCH, dev->keybit);