From 445cac6070a480329b664dfbe20cbb3a754a0ef3 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 16 Nov 2009 22:12:21 -0800 Subject: [PATCH] --- yaml --- r: 174233 b: refs/heads/master c: 21f25573fbd1b459d5401f2b72160f745013fc34 h: refs/heads/master i: 174231: 0e092a66362b985c89101ceb2b668080dea849b2 v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/touchkit_ps2.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a8b2f5d98eed..34b87be37bcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d69249f4b6857c0b23ceca270ae591381b16bba9 +refs/heads/master: 21f25573fbd1b459d5401f2b72160f745013fc34 diff --git a/trunk/drivers/input/mouse/touchkit_ps2.c b/trunk/drivers/input/mouse/touchkit_ps2.c index 0308a0faa94d..909431c31ab4 100644 --- a/trunk/drivers/input/mouse/touchkit_ps2.c +++ b/trunk/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);