aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-02-24 15:05:51 -0800
committerJohn Rigby <john.rigby@linaro.org>2012-06-25 15:02:22 -0600
commit2516cd8e3feb75b7e6ad64aa1050d1ae75d55007 (patch)
tree9e7a00143efd8f3a0556e0e67b047abd7a3ce3f4
parent5de0b6da6850074152f60c28f86fb941e9e0293f (diff)
UBUNTU: SAUCE: Input: synapticss - Set buttonpad property for all clickpads
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com> Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-rw-r--r--drivers/input/mouse/synaptics.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index c703d53be3a..c6d98696399 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -1223,7 +1223,9 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
/* Clickpads report only left button */
__clear_bit(BTN_RIGHT, dev->keybit);
__clear_bit(BTN_MIDDLE, dev->keybit);
- }
+ } else if (SYN_CAP_CLICKPAD2BTN(priv->ext_cap_0c) ||
+ SYN_CAP_CLICKPAD2BTN2(priv->ext_cap_0c))
+ __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
}
static ssize_t synaptics_show_disable_gesture(struct psmouse *psmouse,