From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sat, 12 Dec 2009 07:54:54 +0000 (-0800)
Subject: Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad
X-Git-Tag: v2.6.33-rc6~2^2~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7105d2ea73e1391b681d0e1212c42f561c64d429;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad

Relative events are only reported via secondary device therefore device
associated with the touchpad should not advertise these capabilities.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index a3f492a..b03e7e0 100644
--- a/drivers/input/mouse/alps.c
+++ b/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);