[PATCH 37/39] input: Check for IM Explorer mice even if IMPS check failed.
From: Vojtech Pavlik (vojtech_at_suse.cz)
Date: 06/07/04
- Previous message: Takashi Iwai: "Re: [RFC] ASLA design, depth of code review and lack thereof"
- In reply to: Vojtech Pavlik: "[PATCH 36/39] input: Fix an oops at opentime of /dev/input/event devices"
- Next in thread: Vojtech Pavlik: "[PATCH 38/39] input: Fix oops in hiddev"
- Reply: Vojtech Pavlik: "[PATCH 38/39] input: Fix oops in hiddev"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
To: torvalds@osdl.org, akpm@osdl.org, vojtech@ucw.cz, linux-kernel@vger.kernel.org Date: Mon, 7 Jun 2004 13:55:55 +0200
You can pull this changeset from:
bk://kernel.bkbits.net/vojtech/input-for-linus
===================================================================
ChangeSet@1.1612.1.17, 2004-05-14 11:18:46+02:00, vojtech@suse.cz
input: Check for IM Explorer mice even if IMPS check failed.
psmouse-base.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
===================================================================
diff -Nru a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/psmouse-base.c 2004-06-07 13:10:27 +02:00
+++ b/drivers/input/mouse/psmouse-base.c 2004-06-07 13:10:27 +02:00
@@ -461,24 +461,25 @@
return type;
}
- if (max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse)) {
+ if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse)) {
if (set_properties) {
set_bit(REL_WHEEL, psmouse->dev.relbit);
+ set_bit(BTN_SIDE, psmouse->dev.keybit);
+ set_bit(BTN_EXTRA, psmouse->dev.keybit);
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) {
- set_bit(BTN_SIDE, psmouse->dev.keybit);
- set_bit(BTN_EXTRA, psmouse->dev.keybit);
- if (!psmouse->name)
- psmouse->name = "Explorer Mouse";
- }
+ if (max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse)) {
- return PSMOUSE_IMEX;
+ if (set_properties) {
+ set_bit(REL_WHEEL, psmouse->dev.relbit);
+ if (!psmouse->name)
+ psmouse->name = "Wheel Mouse";
}
return PSMOUSE_IMPS;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Previous message: Takashi Iwai: "Re: [RFC] ASLA design, depth of code review and lack thereof"
- In reply to: Vojtech Pavlik: "[PATCH 36/39] input: Fix an oops at opentime of /dev/input/event devices"
- Next in thread: Vojtech Pavlik: "[PATCH 38/39] input: Fix oops in hiddev"
- Reply: Vojtech Pavlik: "[PATCH 38/39] input: Fix oops in hiddev"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
