diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-16 22:12:21 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-20 00:52:12 -0800 |
| commit | 315eb996d5505112b22452ccbc7e01fb02eaae81 (patch) | |
| tree | 86abf8a390575efe1bc0b678dbd27310ff351f59 /drivers/input/mouse/logips2pp.c | |
| parent | Input: lifebook - do not advertise unsupported buttons (diff) | |
| download | linux-dev-315eb996d5505112b22452ccbc7e01fb02eaae81.tar.xz linux-dev-315eb996d5505112b22452ccbc7e01fb02eaae81.zip | |
Input: psmouse - rework setting of BTN_MIDDLE capability
Do not start protocol detection assuming that middle mouse is present,
instead let individual protocols explicitly set this capability.
This fixes issue with Synaptics touchpads pretending that they have
middle button when hardware clearly reports otherwise.
Reported-and-tested-by: Andrey Borzenkov <arvidjaar@mail.ru>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse/logips2pp.c')
| -rw-r--r-- | drivers/input/mouse/logips2pp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c index ab5dc5f5fd83..543c240a85f2 100644 --- a/drivers/input/mouse/logips2pp.c +++ b/drivers/input/mouse/logips2pp.c @@ -404,8 +404,8 @@ int ps2pp_init(struct psmouse *psmouse, bool set_properties) } } - if (buttons < 3) - __clear_bit(BTN_MIDDLE, psmouse->dev->keybit); + if (buttons >= 3) + __set_bit(BTN_MIDDLE, psmouse->dev->keybit); if (model_info) ps2pp_set_model_properties(psmouse, model_info, use_ps2pp); |