summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-11-16 22:12:21 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-11-20 00:52:10 -0800
commit21f25573fbd1b459d5401f2b72160f745013fc34 (patch)
treee03790e43ddf9c7b6fa0b6d68b378d4fd6285a30 /drivers/input
parentd69249f4b6857c0b23ceca270ae591381b16bba9 (diff)
downloadtalos-obmc-linux-21f25573fbd1b459d5401f2b72160f745013fc34.tar.gz
talos-obmc-linux-21f25573fbd1b459d5401f2b72160f745013fc34.zip
Input: touchkit_ps2 - do not advertise unsupported buttons
Touchkit PS/2 touchscreen does not have left/right/middle buttons and should not be advertising as capable of generating these events. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/touchkit_ps2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mouse/touchkit_ps2.c b/drivers/input/mouse/touchkit_ps2.c
index 0308a0faa94d..909431c31ab4 100644
--- a/drivers/input/mouse/touchkit_ps2.c
+++ b/drivers/input/mouse/touchkit_ps2.c
@@ -86,7 +86,8 @@ int touchkit_ps2_detect(struct psmouse *psmouse, bool set_properties)
if (set_properties) {
dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
- __set_bit(BTN_TOUCH, dev->keybit);
+ dev->keybit[BIT_WORD(BTN_MOUSE)] = 0;
+ dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
input_set_abs_params(dev, ABS_X, 0, TOUCHKIT_MAX_XC, 0, 0);
input_set_abs_params(dev, ABS_Y, 0, TOUCHKIT_MAX_YC, 0, 0);
OpenPOWER on IntegriCloud