summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-07-20 20:25:35 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-07-20 20:29:11 -0700
commit7b5d3312fbfbb21d2fc7de94e0db66cfdf8b0055 (patch)
tree29f2c92dea84554ab0cd73f57df2a4ca5bad476f
parent1afaab90e8c0317170a53967064a934a77a59c16 (diff)
downloadop-kernel-dev-7b5d3312fbfbb21d2fc7de94e0db66cfdf8b0055.zip
op-kernel-dev-7b5d3312fbfbb21d2fc7de94e0db66cfdf8b0055.tar.gz
Input: gamecon - reference correct input device in NES mode
We moved input devices from 'struct gc' to individial pads (struct gc-pad), but gc_nes_process_packet() was still trying to use old ones and crashing. Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/input/joystick/gamecon.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index fbd62ab..a79f708 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -89,7 +89,6 @@ struct gc_pad {
struct gc {
struct pardevice *pd;
struct gc_pad pads[GC_MAX_DEVICES];
- struct input_dev *dev[GC_MAX_DEVICES];
struct timer_list timer;
int pad_count[GC_MAX];
int used;
@@ -387,7 +386,7 @@ static void gc_nes_process_packet(struct gc *gc)
for (i = 0; i < GC_MAX_DEVICES; i++) {
pad = &gc->pads[i];
- dev = gc->dev[i];
+ dev = pad->dev;
s = gc_status_bit[i];
switch (pad->type) {
OpenPOWER on IntegriCloud