Commit 69990663 authored by Vojtech Pavlik's avatar Vojtech Pavlik

input: Check for IM Explorer mice even if IMPS check failed.

parent e88468ac
...@@ -461,24 +461,25 @@ static int psmouse_extensions(struct psmouse *psmouse, ...@@ -461,24 +461,25 @@ static int psmouse_extensions(struct psmouse *psmouse,
return type; return type;
} }
if (max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse)) { if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse)) {
if (set_properties) { if (set_properties) {
set_bit(REL_WHEEL, psmouse->dev.relbit); set_bit(REL_WHEEL, psmouse->dev.relbit);
set_bit(BTN_SIDE, psmouse->dev.keybit);
set_bit(BTN_EXTRA, psmouse->dev.keybit);
if (!psmouse->name) if (!psmouse->name)
psmouse->name = "Wheel Mouse"; psmouse->name = "Explorer Mouse";
} }
if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse)) { return PSMOUSE_IMEX;
}
if (!set_properties) { if (max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse)) {
set_bit(BTN_SIDE, psmouse->dev.keybit);
set_bit(BTN_EXTRA, psmouse->dev.keybit);
if (!psmouse->name)
psmouse->name = "Explorer Mouse";
}
return PSMOUSE_IMEX; if (set_properties) {
set_bit(REL_WHEEL, psmouse->dev.relbit);
if (!psmouse->name)
psmouse->name = "Wheel Mouse";
} }
return PSMOUSE_IMPS; return PSMOUSE_IMPS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment