diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-04-12 07:32:22 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-04-12 07:32:22 +0200 |
| commit | 688897b0d4910e097f34c0e263d649cf2036eb45 (patch) | |
| tree | 4b6eb217ca502d93c433ee721e3a62c5069eec65 /drivers/input/mouse/logips2pp.c | |
| parent | Input: i8042 - disable interfaces when switching to legacy mode (diff) | |
| download | linux-688897b0d4910e097f34c0e263d649cf2036eb45.tar.xz linux-688897b0d4910e097f34c0e263d649cf2036eb45.zip | |
Input: logips2pp - ignore mice reporting model as 0
There are mice reporting to logitech's queries with model
of 0. Do not claim that these are Logitech mice.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse/logips2pp.c')
| -rw-r--r-- | drivers/input/mouse/logips2pp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c index d3ddea26b8ca..74a8ba7c71f8 100644 --- a/drivers/input/mouse/logips2pp.c +++ b/drivers/input/mouse/logips2pp.c @@ -338,12 +338,12 @@ int ps2pp_init(struct psmouse *psmouse, int set_properties) param[1] = 0; ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO); - if (!param[1]) - return -1; - model = ((param[0] >> 4) & 0x07) | ((param[0] << 3) & 0x78); buttons = param[1]; + if (!model || !buttons) + return -1; + if ((model_info = get_model_info(model)) != NULL) { /* |