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
/
gf2k.c
diff --git
a/drivers/input/joystick/gf2k.c
b/drivers/input/joystick/gf2k.c
index
8a3ad45
..
bacbab5
100644
(file)
--- a/
drivers/input/joystick/gf2k.c
+++ b/
drivers/input/joystick/gf2k.c
@@
-298,7
+298,7
@@
static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
gameport_set_poll_handler(gameport, gf2k_poll);
gameport_set_poll_interval(gameport, 20);
gameport_set_poll_handler(gameport, gf2k_poll);
gameport_set_poll_interval(gameport, 20);
- s
printf(gf2k->phys
, "%s/input0", gameport->phys);
+ s
nprintf(gf2k->phys, sizeof(gf2k->phys)
, "%s/input0", gameport->phys);
gf2k->length = gf2k_lens[gf2k->id];
gf2k->length = gf2k_lens[gf2k->id];
@@
-341,7
+341,9
@@
static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
input_dev->absflat[gf2k_abs[i]] = (i < 2) ? 24 : 0;
}
input_dev->absflat[gf2k_abs[i]] = (i < 2) ? 24 : 0;
}
- input_register_device(gf2k->dev);
+ err = input_register_device(gf2k->dev);
+ if (err)
+ goto fail2;
return 0;
return 0;