diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-07-21 07:25:35 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 21:29:53 +0400 |
| commit | 590a040d36b9bb5aa1b2a59de1675670f2823330 (patch) | |
| tree | 9d4a77d793ee7271df33e8fae17d6002b2011e98 /drivers/input | |
| parent | 34efb27b0b051927fdcde30da3aec0e42d727bb4 (diff) | |
| download | linux-590a040d36b9bb5aa1b2a59de1675670f2823330.tar.xz | |
Input: gamecon - reference correct input device in NES mode
commit 7b5d3312fbfbb21d2fc7de94e0db66cfdf8b0055 upstream.
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.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/joystick/gamecon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c index fbd62abb66f9..a79f70844108 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) { |