summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/db9.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 15:12:25 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 15:12:25 -0700
commit8f7c58814eb75bf97b8bc18d107b2e26f28b6585 (patch)
treef871b4c546986e257fcecf57fae31426b9f7ef55 /drivers/input/joystick/db9.c
parent1c952af548012bcf281623dafa2173897bfc6a77 (diff)
parent0a3a6d69b7e9f1d7fa5add7db528e7b81cbd422e (diff)
downloadlinux-stable-8f7c58814eb75bf97b8bc18d107b2e26f28b6585.tar.gz
linux-stable-8f7c58814eb75bf97b8bc18d107b2e26f28b6585.tar.bz2
linux-stable-8f7c58814eb75bf97b8bc18d107b2e26f28b6585.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: Input: db9 - fix potential buffer overrun Input: atkbd - fix hardware autorepeat Input: wistron - add mapping for Wistron MS 2111
Diffstat (limited to 'drivers/input/joystick/db9.c')
-rw-r--r--drivers/input/joystick/db9.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 6f31f054d1bb..5080e15c6d30 100644
--- 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;
}
- 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;