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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: reduce raciness when input handlers disconnect
Input: ucb1x00 - do not access input_dev->private directly
Input: logips2pp - fix typo in Kconfig
Input: db9 - do not ignore dev2 module parameter

+10 -9
+1 -1
drivers/input/evdev.c
··· 699 699 if (evdev->open) { 700 700 input_flush_device(handle, NULL); 701 701 input_close_device(handle); 702 - wake_up_interruptible(&evdev->wait); 703 702 list_for_each_entry(client, &evdev->client_list, node) 704 703 kill_fasync(&client->fasync, SIGIO, POLL_HUP); 704 + wake_up_interruptible(&evdev->wait); 705 705 } else 706 706 evdev_free(evdev); 707 707 }
+1 -1
drivers/input/joydev.c
··· 594 594 595 595 if (joydev->open) { 596 596 input_close_device(handle); 597 - wake_up_interruptible(&joydev->wait); 598 597 list_for_each_entry(client, &joydev->client_list, node) 599 598 kill_fasync(&client->fasync, SIGIO, POLL_HUP); 599 + wake_up_interruptible(&joydev->wait); 600 600 } else 601 601 joydev_free(joydev); 602 602 }
+1 -1
drivers/input/joystick/db9.c
··· 54 54 55 55 module_param_array_named(dev, db9_cfg[0].args, int, &db9_cfg[0].nargs, 0); 56 56 MODULE_PARM_DESC(dev, "Describes first attached device (<parport#>,<type>)"); 57 - module_param_array_named(dev2, db9_cfg[1].args, int, &db9_cfg[0].nargs, 0); 57 + module_param_array_named(dev2, db9_cfg[1].args, int, &db9_cfg[1].nargs, 0); 58 58 MODULE_PARM_DESC(dev2, "Describes second attached device (<parport#>,<type>)"); 59 59 module_param_array_named(dev3, db9_cfg[2].args, int, &db9_cfg[2].nargs, 0); 60 60 MODULE_PARM_DESC(dev3, "Describes third attached device (<parport#>,<type>)");
+1 -1
drivers/input/mouse/Kconfig
··· 48 48 If unsure, say Y. 49 49 50 50 config MOUSE_PS2_LOGIPS2PP 51 - bool "Logictech PS/2++ mouse protocol extension" if EMBEDDED 51 + bool "Logitech PS/2++ mouse protocol extension" if EMBEDDED 52 52 default y 53 53 depends on MOUSE_PS2 54 54 help
+1 -1
drivers/input/mousedev.c
··· 766 766 767 767 if (mousedev->open) { 768 768 input_close_device(handle); 769 - wake_up_interruptible(&mousedev->wait); 770 769 list_for_each_entry(client, &mousedev->client_list, node) 771 770 kill_fasync(&client->fasync, SIGIO, POLL_HUP); 771 + wake_up_interruptible(&mousedev->wait); 772 772 } else 773 773 mousedev_free(mousedev); 774 774 }
+1 -1
drivers/input/tsdev.c
··· 476 476 477 477 if (tsdev->open) { 478 478 input_close_device(handle); 479 - wake_up_interruptible(&tsdev->wait); 480 479 list_for_each_entry(client, &tsdev->client_list, node) 481 480 kill_fasync(&client->fasync, SIGIO, POLL_HUP); 481 + wake_up_interruptible(&tsdev->wait); 482 482 } else 483 483 tsdev_free(tsdev); 484 484 }
+4 -3
drivers/mfd/ucb1x00-ts.c
··· 291 291 292 292 static int ucb1x00_ts_open(struct input_dev *idev) 293 293 { 294 - struct ucb1x00_ts *ts = idev->private; 294 + struct ucb1x00_ts *ts = input_get_drvdata(idev); 295 295 int ret = 0; 296 296 297 297 BUG_ON(ts->rtask); ··· 328 328 */ 329 329 static void ucb1x00_ts_close(struct input_dev *idev) 330 330 { 331 - struct ucb1x00_ts *ts = idev->private; 331 + struct ucb1x00_ts *ts = input_get_drvdata(idev); 332 332 333 333 if (ts->rtask) 334 334 kthread_stop(ts->rtask); ··· 380 380 ts->idev = idev; 381 381 ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC; 382 382 383 - idev->private = ts; 384 383 idev->name = "Touchscreen panel"; 385 384 idev->id.product = ts->ucb->id; 386 385 idev->open = ucb1x00_ts_open; ··· 389 390 __set_bit(ABS_X, idev->absbit); 390 391 __set_bit(ABS_Y, idev->absbit); 391 392 __set_bit(ABS_PRESSURE, idev->absbit); 393 + 394 + input_set_drvdata(idev, ts); 392 395 393 396 err = input_register_device(idev); 394 397 if (err)