From a42f57f221e946621303a8950e93d77fca124b5f Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Fri, 11 Dec 2009 23:54:54 -0800 Subject: [PATCH] --- yaml --- r: 177075 b: refs/heads/master c: 7105d2ea73e1391b681d0e1212c42f561c64d429 h: refs/heads/master i: 177073: e2e47269dc8fa429a57fcdb692cedccbaf780b4a 177071: 3de9e2d1cfebe25b64d2a6de1822b273ec9279b5 v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/alps.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 95d4defa00a5..3513a0860045 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df2d4637b0813e47ad12af3eacf6b5292c0fb164 +refs/heads/master: 7105d2ea73e1391b681d0e1212c42f561c64d429 diff --git a/trunk/drivers/input/mouse/alps.c b/trunk/drivers/input/mouse/alps.c index a3f492a50850..b03e7e0b4099 100644 --- a/trunk/drivers/input/mouse/alps.c +++ b/trunk/drivers/input/mouse/alps.c @@ -487,6 +487,17 @@ int alps_init(struct psmouse *psmouse) if (alps_hw_init(psmouse)) goto init_fail; + /* + * Undo part of setup done for us by psmouse core since touchpad + * is not a relative device. + */ + __clear_bit(EV_REL, dev1->evbit); + __clear_bit(REL_X, dev1->relbit); + __clear_bit(REL_Y, dev1->relbit); + + /* + * Now set up our capabilities. + */ dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY); dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH); dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER);