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
/
db9.c
diff --git
a/drivers/input/joystick/db9.c
b/drivers/input/joystick/db9.c
index
e618946
..
5080e15
100644
(file)
--- a/
drivers/input/joystick/db9.c
+++ b/
drivers/input/joystick/db9.c
@@
-584,7
+584,7
@@
static struct db9 __init *db9_probe(int parport, int mode)
goto err_out;
}
goto err_out;
}
- if (db9_mode
[mode].
bidirectional && !(pp->modes & PARPORT_MODE_TRISTATE)) {
+ if (db9_mode
->
bidirectional && !(pp->modes & PARPORT_MODE_TRISTATE)) {
printk(KERN_ERR "db9.c: specified parport is not bidirectional\n");
err = -EINVAL;
goto err_put_pp;
printk(KERN_ERR "db9.c: specified parport is not bidirectional\n");
err = -EINVAL;
goto err_put_pp;
@@
-620,7
+620,8
@@
static struct db9 __init *db9_probe(int parport, int mode)
goto err_unreg_devs;
}
goto err_unreg_devs;
}
- sprintf(db9->phys[i], "%s/input%d", db9->pd->port->name, i);
+ snprintf(db9->phys[i], sizeof(db9->phys[i]),
+ "%s/input%d", db9->pd->port->name, i);
input_dev->name = db9_mode->name;
input_dev->phys = db9->phys[i];
input_dev->name = db9_mode->name;
input_dev->phys = db9->phys[i];