summaryrefslogtreecommitdiff
path: root/drivers/input/mouse
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@debian.org>2008-01-14 01:07:37 -0500
committerAndres Salomon <dilinger@debian.org>2008-01-14 01:07:37 -0500
commitdaa533bb997c59411fa934cd27d104f2d9686a68 (patch)
tree3611c7d20416d0c8bbb8a203d9b409f406b02b93 /drivers/input/mouse
parent8bb1b094c22f697100fe1b33e8b64205527ff723 (diff)
downloadlwn-daa533bb997c59411fa934cd27d104f2d9686a68.tar.gz
lwn-daa533bb997c59411fa934cd27d104f2d9686a68.zip
OLPC: psmouse: unset input bits in the same way that psmouse-base.c sets them
Signed-off-by: Andres Salomon <dilinger@debian.org>
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r--drivers/input/mouse/olpc.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/input/mouse/olpc.c b/drivers/input/mouse/olpc.c
index b06b56daade9..4f105b9f0b56 100644
--- a/drivers/input/mouse/olpc.c
+++ b/drivers/input/mouse/olpc.c
@@ -478,12 +478,10 @@ int olpc_init(struct psmouse *psmouse)
goto init_fail;
}
- /*
- * Unset some of the default bits for things we don't have.
- */
- pt->evbit[LONG(EV_REL)] &= ~BIT(EV_REL);
- pt->relbit[LONG(REL_X)] &= ~(BIT(REL_X) | BIT(REL_Y));
- pt->keybit[LONG(BTN_MIDDLE)] &= ~BIT(BTN_MIDDLE);
+ /* Unset things that psmouse-base set that we don't have */
+ pt->evbit[0] &= ~BIT(EV_REL);
+ pt->keybit[LONG(BTN_MOUSE)] &= ~BIT(BTN_MIDDLE);
+ pt->relbit[0] &= ~(BIT(REL_X) | BIT(REL_Y));
pt->evbit[LONG(EV_KEY)] |= BIT(EV_KEY);
pt->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);