git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
input
/
joystick
/
magellan.c
diff --git
a/drivers/input/joystick/magellan.c
b/drivers/input/joystick/magellan.c
index
ca3cc23
..
168b106
100644
(file)
--- a/
drivers/input/joystick/magellan.c
+++ b/
drivers/input/joystick/magellan.c
@@
-162,7
+162,7
@@
static int magellan_connect(struct serio *serio, struct serio_driver *drv)
goto fail;
magellan->dev = input_dev;
goto fail;
magellan->dev = input_dev;
- s
printf(magellan->phys
, "%s/input0", serio->phys);
+ s
nprintf(magellan->phys, sizeof(magellan->phys)
, "%s/input0", serio->phys);
input_dev->name = "LogiCad3D Magellan / SpaceMouse";
input_dev->phys = magellan->phys;
input_dev->name = "LogiCad3D Magellan / SpaceMouse";
input_dev->phys = magellan->phys;