Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: db9 - store object at correct index

The variable i is used to check the port to attach to and we are
supposed to save the reference of struct db9 in the location given by
db9_base[i]. But after finding out the index, i is getting modified again
so we saved in a wrong index.
While at it mark db9_base[i] as NULL after it is freed.

Fixes: 2260c419b52b ("Input: db9 - use parallel port device model")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Sudip Mukherjee and committed by
Dmitry Torokhov
dd23bf10 92deea13

+10 -9
+10 -9
drivers/input/joystick/db9.c
··· 560 560 const struct db9_mode_data *db9_mode; 561 561 struct pardevice *pd; 562 562 struct input_dev *input_dev; 563 - int i, j; 563 + int i, j, port_idx; 564 564 int mode; 565 565 struct pardev_cb db9_parport_cb; 566 566 567 - for (i = 0; i < DB9_MAX_PORTS; i++) { 568 - if (db9_cfg[i].nargs == 0 || 569 - db9_cfg[i].args[DB9_ARG_PARPORT] < 0) 567 + for (port_idx = 0; port_idx < DB9_MAX_PORTS; port_idx++) { 568 + if (db9_cfg[port_idx].nargs == 0 || 569 + db9_cfg[port_idx].args[DB9_ARG_PARPORT] < 0) 570 570 continue; 571 571 572 - if (db9_cfg[i].args[DB9_ARG_PARPORT] == pp->number) 572 + if (db9_cfg[port_idx].args[DB9_ARG_PARPORT] == pp->number) 573 573 break; 574 574 } 575 575 576 - if (i == DB9_MAX_PORTS) { 576 + if (port_idx == DB9_MAX_PORTS) { 577 577 pr_debug("Not using parport%d.\n", pp->number); 578 578 return; 579 579 } 580 580 581 - mode = db9_cfg[i].args[DB9_ARG_MODE]; 581 + mode = db9_cfg[port_idx].args[DB9_ARG_MODE]; 582 582 583 583 if (mode < 1 || mode >= DB9_MAX_PAD || !db9_modes[mode].n_buttons) { 584 584 printk(KERN_ERR "db9.c: Bad device type %d\n", mode); ··· 594 594 595 595 db9_parport_cb.flags = PARPORT_FLAG_EXCL; 596 596 597 - pd = parport_register_dev_model(pp, "db9", &db9_parport_cb, i); 597 + pd = parport_register_dev_model(pp, "db9", &db9_parport_cb, port_idx); 598 598 if (!pd) { 599 599 printk(KERN_ERR "db9.c: parport busy already - lp.o loaded?\n"); 600 600 return; ··· 649 649 goto err_free_dev; 650 650 } 651 651 652 - db9_base[i] = db9; 652 + db9_base[port_idx] = db9; 653 653 return; 654 654 655 655 err_free_dev: ··· 676 676 return; 677 677 678 678 db9 = db9_base[i]; 679 + db9_base[i] = NULL; 679 680 680 681 for (i = 0; i < min(db9_modes[db9->mode].n_pads, DB9_MAX_DEVICES); i++) 681 682 input_unregister_device(db9->dev[i]);