summaryrefslogtreecommitdiffstats
path: root/drivers/char/joystick
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-18 22:06:10 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-18 22:06:10 +0000
commitaba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch)
tree23921efb2b4af590160f034a89ff3da2ecca6e47 /drivers/char/joystick
parent9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff)
Merge with Linux 2.3.43.
Diffstat (limited to 'drivers/char/joystick')
-rw-r--r--drivers/char/joystick/joy-creative.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/joystick/joy-creative.c b/drivers/char/joystick/joy-creative.c
index 7e97a677d..8faec5f82 100644
--- a/drivers/char/joystick/joy-creative.c
+++ b/drivers/char/joystick/joy-creative.c
@@ -66,7 +66,7 @@ static int js_cr_read_packet(int io, unsigned int *data)
int r[2], t[2], p[2];
int i, j, ret;
- for (i = 0; i < 2; i++); {
+ for (i = 0; i < 2; i++) {
r[i] = buf[i] = 0;
p[i] = t[i] = JS_CR_MAX_STROBE;
p[i] += JS_CR_MAX_STROBE;