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
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[pandora-kernel.git]
/
drivers
/
input
/
mouse
/
trackpoint.c
diff --git
a/drivers/input/mouse/trackpoint.c
b/drivers/input/mouse/trackpoint.c
index
0643e49
..
54b2fa8
100644
(file)
--- a/
drivers/input/mouse/trackpoint.c
+++ b/
drivers/input/mouse/trackpoint.c
@@
-303,7
+303,7
@@
int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);
if (!psmouse->private)
- return -
1
;
+ return -
ENOMEM
;
psmouse->vendor = "IBM";
psmouse->name = "TrackPoint";