git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Input: trackpoint - assume 3 buttons when buttons detection fails
[pandora-kernel.git]
/
drivers
/
input
/
mouse
/
trackpoint.c
diff --git
a/drivers/input/mouse/trackpoint.c
b/drivers/input/mouse/trackpoint.c
index
54b2fa8
..
5d4dde2
100644
(file)
--- a/
drivers/input/mouse/trackpoint.c
+++ b/
drivers/input/mouse/trackpoint.c
@@
-186,7
+186,8
@@
static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *fir
if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID)))
return -1;
if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID)))
return -1;
- if (param[0] != TP_MAGIC_IDENT)
+ /* add new TP ID. */
+ if (!(param[0] & TP_MAGIC_IDENT))
return -1;
if (firmware_id)
return -1;
if (firmware_id)
@@
-297,8
+298,8
@@
int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
return 0;
if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) {
return 0;
if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) {
- printk(KERN_WARNING "trackpoint.c: failed to get extended button data\n");
- button_info = 0;
+ printk(KERN_WARNING "trackpoint.c: failed to get extended button data
, assuming 3 buttons
\n");
+ button_info = 0
x33
;
}
psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);
}
psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);