diff options
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/alps.c | 3 | ||||
| -rw-r--r-- | drivers/input/mouse/elantech.c | 3 | ||||
| -rw-r--r-- | drivers/input/mouse/synaptics_usb.c | 1 | ||||
| -rw-r--r-- | drivers/input/mouse/trackpoint.c | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index a956b980ee73..9d9e5076d402 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
| @@ -2373,6 +2373,9 @@ int alps_init(struct psmouse *psmouse) | |||
| 2373 | dev2->keybit[BIT_WORD(BTN_LEFT)] = | 2373 | dev2->keybit[BIT_WORD(BTN_LEFT)] = |
| 2374 | BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT); | 2374 | BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT); |
| 2375 | 2375 | ||
| 2376 | if (priv->flags & ALPS_DUALPOINT) | ||
| 2377 | __set_bit(INPUT_PROP_POINTING_STICK, dev2->propbit); | ||
| 2378 | |||
| 2376 | if (input_register_device(priv->dev2)) | 2379 | if (input_register_device(priv->dev2)) |
| 2377 | goto init_fail; | 2380 | goto init_fail; |
| 2378 | 2381 | ||
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index d71bd3635de1..0cbf6281899c 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c | |||
| @@ -1614,6 +1614,9 @@ int elantech_init(struct psmouse *psmouse) | |||
| 1614 | tp_dev->keybit[BIT_WORD(BTN_LEFT)] = | 1614 | tp_dev->keybit[BIT_WORD(BTN_LEFT)] = |
| 1615 | BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | | 1615 | BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | |
| 1616 | BIT_MASK(BTN_RIGHT); | 1616 | BIT_MASK(BTN_RIGHT); |
| 1617 | |||
| 1618 | __set_bit(INPUT_PROP_POINTING_STICK, tp_dev->propbit); | ||
| 1619 | |||
| 1617 | error = input_register_device(etd->tp_dev); | 1620 | error = input_register_device(etd->tp_dev); |
| 1618 | if (error < 0) | 1621 | if (error < 0) |
| 1619 | goto init_fail_tp_reg; | 1622 | goto init_fail_tp_reg; |
diff --git a/drivers/input/mouse/synaptics_usb.c b/drivers/input/mouse/synaptics_usb.c index e122bda16aab..db3973d78207 100644 --- a/drivers/input/mouse/synaptics_usb.c +++ b/drivers/input/mouse/synaptics_usb.c | |||
| @@ -387,6 +387,7 @@ static int synusb_probe(struct usb_interface *intf, | |||
| 387 | __set_bit(EV_REL, input_dev->evbit); | 387 | __set_bit(EV_REL, input_dev->evbit); |
| 388 | __set_bit(REL_X, input_dev->relbit); | 388 | __set_bit(REL_X, input_dev->relbit); |
| 389 | __set_bit(REL_Y, input_dev->relbit); | 389 | __set_bit(REL_Y, input_dev->relbit); |
| 390 | __set_bit(INPUT_PROP_POINTING_STICK, input_dev->propbit); | ||
| 390 | input_set_abs_params(input_dev, ABS_PRESSURE, 0, 127, 0, 0); | 391 | input_set_abs_params(input_dev, ABS_PRESSURE, 0, 127, 0, 0); |
| 391 | } else { | 392 | } else { |
| 392 | input_set_abs_params(input_dev, ABS_X, | 393 | input_set_abs_params(input_dev, ABS_X, |
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index ca843b6cf6bd..b377462748a2 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c | |||
| @@ -393,6 +393,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) | |||
| 393 | if ((button_info & 0x0f) >= 3) | 393 | if ((button_info & 0x0f) >= 3) |
| 394 | __set_bit(BTN_MIDDLE, psmouse->dev->keybit); | 394 | __set_bit(BTN_MIDDLE, psmouse->dev->keybit); |
| 395 | 395 | ||
| 396 | __set_bit(INPUT_PROP_POINTING_STICK, psmouse->dev->propbit); | ||
| 397 | |||
| 396 | trackpoint_defaults(psmouse->private); | 398 | trackpoint_defaults(psmouse->private); |
| 397 | 399 | ||
| 398 | error = trackpoint_power_on_reset(&psmouse->ps2dev); | 400 | error = trackpoint_power_on_reset(&psmouse->ps2dev); |
