git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
joystick
/
turbografx.c
diff --git
a/drivers/input/joystick/turbografx.c
b/drivers/input/joystick/turbografx.c
index 27b6a3ce18caf2e996177e6c313fff2b21a4ad19..891797ad76bccda3ae132e1fc59483b539e522ee 100644
(file)
--- a/
drivers/input/joystick/turbografx.c
+++ b/
drivers/input/joystick/turbografx.c
@@
-196,7
+196,7
@@
static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
if (n_buttons[i] < 1)
continue;
- if (n_buttons[i] >
6
) {
+ if (n_buttons[i] >
ARRAY_SIZE(tgfx_buttons)
) {
printk(KERN_ERR "turbografx.c: Invalid number of buttons %d\n", n_buttons[i]);
err = -EINVAL;
goto err_unreg_devs;