From a0a60d2d21d7ab85f48197803dd395cc3e81ee3f Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Tue, 20 Jul 2010 20:25:35 -0700 Subject: [PATCH] --- yaml --- r: 201173 b: refs/heads/master c: c25f7b763cc35a249232ce612a36a811b0e263f9 h: refs/heads/master i: 201171: 7a9b58ec5886b97c88772a40673740fc3eee9741 v: v3 --- [refs] | 2 +- trunk/drivers/input/joystick/gamecon.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7684db7b372b..d48f26483371 100644 --- 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 index a79f70844108..0ffaf2c77a19 100644 --- 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;