diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-10-06 02:23:08 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-06 02:34:57 +0200 |
| commit | c65cf815653ec64e73d40819806c2d1aed91681e (patch) | |
| tree | 2faaee571d3826d9a4e9bf8e51b0ba709981b4a8 /drivers/input/joystick | |
| parent | Input: gamecon - store object at correct index (diff) | |
| download | linux-c65cf815653ec64e73d40819806c2d1aed91681e.tar.xz linux-c65cf815653ec64e73d40819806c2d1aed91681e.zip | |
Input: turbografx - store object in correct index
The variable i is used to check the port to attach to and we are
supposed to save the reference of struct tgfx in the location given by
tgfx_base[i]. But after finding out the index, i is getting modified
again so we saved in a wrong index.
Fixes: 4de27a638a99 ("Input: turbografx - use parallel port device model")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/turbografx.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c index 01e8ea92b9ad..9f5bca26bd2f 100644 --- a/drivers/input/joystick/turbografx.c +++ b/drivers/input/joystick/turbografx.c @@ -162,27 +162,29 @@ static void tgfx_attach(struct parport *pp) struct tgfx *tgfx; struct input_dev *input_dev; struct pardevice *pd; - int i, j; + int i, j, port_idx; int *n_buttons, n_devs; struct pardev_cb tgfx_parport_cb; - for (i = 0; i < TGFX_MAX_PORTS; i++) { - if (tgfx_cfg[i].nargs == 0 || tgfx_cfg[i].args[0] < 0) + for (port_idx = 0; port_idx < TGFX_MAX_PORTS; port_idx++) { + if (tgfx_cfg[port_idx].nargs == 0 || + tgfx_cfg[port_idx].args[0] < 0) continue; - if (tgfx_cfg[i].args[0] == pp->number) + if (tgfx_cfg[port_idx].args[0] == pp->number) break; } - if (i == TGFX_MAX_PORTS) { + if (port_idx == TGFX_MAX_PORTS) { pr_debug("Not using parport%d.\n", pp->number); return; } - n_buttons = tgfx_cfg[i].args + 1; - n_devs = tgfx_cfg[i].nargs - 1; + n_buttons = tgfx_cfg[port_idx].args + 1; + n_devs = tgfx_cfg[port_idx].nargs - 1; tgfx_parport_cb.flags = PARPORT_FLAG_EXCL; - pd = parport_register_dev_model(pp, "turbografx", &tgfx_parport_cb, i); + pd = parport_register_dev_model(pp, "turbografx", &tgfx_parport_cb, + port_idx); if (!pd) { pr_err("parport busy already - lp.o loaded?\n"); return; @@ -250,7 +252,7 @@ static void tgfx_attach(struct parport *pp) goto err_free_tgfx; } - tgfx_base[i] = tgfx; + tgfx_base[port_idx] = tgfx; return; err_free_dev: |