aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/lifebook.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/mouse/lifebook.c')
-rw-r--r--drivers/input/mouse/lifebook.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index 82811558ec33..54b7f64d6e62 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -198,10 +198,10 @@ static int lifebook_absolute_mode(struct psmouse *psmouse)
198 return -1; 198 return -1;
199 199
200 /* 200 /*
201 Enable absolute output -- ps2_command fails always but if 201 * Enable absolute output -- ps2_command fails always but if
202 you leave this call out the touchsreen will never send 202 * you leave this call out the touchsreen will never send
203 absolute coordinates 203 * absolute coordinates
204 */ 204 */
205 param = lifebook_use_6byte_proto ? 0x08 : 0x07; 205 param = lifebook_use_6byte_proto ? 0x08 : 0x07;
206 ps2_command(ps2dev, &param, PSMOUSE_CMD_SETRES); 206 ps2_command(ps2dev, &param, PSMOUSE_CMD_SETRES);
207 207
@@ -283,8 +283,8 @@ static int lifebook_create_relative_device(struct psmouse *psmouse)
283 283
284 dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL); 284 dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
285 dev2->relbit[BIT_WORD(REL_X)] = BIT_MASK(REL_X) | BIT_MASK(REL_Y); 285 dev2->relbit[BIT_WORD(REL_X)] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
286 dev2->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) | 286 dev2->keybit[BIT_WORD(BTN_LEFT)] =
287 BIT_MASK(BTN_RIGHT); 287 BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT);
288 288
289 error = input_register_device(priv->dev2); 289 error = input_register_device(priv->dev2);
290 if (error) 290 if (error)
@@ -309,6 +309,7 @@ int lifebook_init(struct psmouse *psmouse)
309 309
310 dev1->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY); 310 dev1->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY);
311 dev1->relbit[0] = 0; 311 dev1->relbit[0] = 0;
312 dev1->keybit[BIT_WORD(BTN_MOUSE)] = 0;
312 dev1->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); 313 dev1->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
313 input_set_abs_params(dev1, ABS_X, 0, max_coord, 0, 0); 314 input_set_abs_params(dev1, ABS_X, 0, max_coord, 0, 0);
314 input_set_abs_params(dev1, ABS_Y, 0, max_coord, 0, 0); 315 input_set_abs_params(dev1, ABS_Y, 0, max_coord, 0, 0);