---

yaml --- r: 201173 b: refs/heads/master c: c25f7b7 h: refs/heads/master i: 201171: 7a9b58e v: v3
git-mirror · Jul 21, 2010 · a0a60d2 · a0a60d2
1 parent f3021eb
commit a0a60d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b5d3312fbfbb21d2fc7de94e0db66cfdf8b0055
+refs/heads/master: c25f7b763cc35a249232ce612a36a811b0e263f9
diff --git a/trunk/drivers/input/joystick/gamecon.c b/trunk/drivers/input/joystick/gamecon.c
@@ -578,7 +578,7 @@ static void gc_psx_command(struct gc *gc, int b, unsigned char *data)
 		read = parport_read_status(port) ^ 0x80;
 
 		for (j = 0; j < GC_MAX_DEVICES; j++) {
-			struct gc_pad *pad = &gc->pads[i];
+			struct gc_pad *pad = &gc->pads[j];
 
 			if (pad->type == GC_PSX || pad->type == GC_DDR)
 				data[j] |= (read & gc_status_bit[j]) ? (1 << i) : 0;