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
/
guillemot.c
diff --git
a/drivers/input/joystick/guillemot.c
b/drivers/input/joystick/guillemot.c
index
6e2c721
..
840ed9b
100644
(file)
--- a/
drivers/input/joystick/guillemot.c
+++ b/
drivers/input/joystick/guillemot.c
@@
-222,7
+222,7
@@
static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
gameport_set_poll_handler(gameport, guillemot_poll);
gameport_set_poll_interval(gameport, 20);
gameport_set_poll_handler(gameport, guillemot_poll);
gameport_set_poll_interval(gameport, 20);
- s
printf(guillemot->phys
, "%s/input0", gameport->phys);
+ s
nprintf(guillemot->phys, sizeof(guillemot->phys)
, "%s/input0", gameport->phys);
guillemot->type = guillemot_type + i;
input_dev->name = guillemot_type[i].name;
guillemot->type = guillemot_type + i;
input_dev->name = guillemot_type[i].name;