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
fedora core 6 1.2949 + vserver 2.2.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
..
dbc5d92
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;
@@
-250,7
+250,9
@@
static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
for (i = 0; (t = guillemot->type->btn[i]) >= 0; i++)
set_bit(t, input_dev->keybit);
for (i = 0; (t = guillemot->type->btn[i]) >= 0; i++)
set_bit(t, input_dev->keybit);
- input_register_device(guillemot->dev);
+ err = input_register_device(guillemot->dev);
+ if (err)
+ goto fail2;
return 0;
return 0;