Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b662c64 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 45efebf2 1dfa2812

drivers/input/evdev.c

+1 −1
Original line number Diff line number Diff line
@@ -699,9 +699,9 @@ static void evdev_disconnect(struct input_handle *handle) 
	if (evdev->open) {

		input_flush_device(handle, NULL);

		input_close_device(handle);

		wake_up_interruptible(&evdev->wait);

		list_for_each_entry(client, &evdev->client_list, node)

			kill_fasync(&client->fasync, SIGIO, POLL_HUP);

		wake_up_interruptible(&evdev->wait);

	} else

		evdev_free(evdev);

}

drivers/input/joydev.c

+1 −1
Original line number Diff line number Diff line
@@ -594,9 +594,9 @@ static void joydev_disconnect(struct input_handle *handle) 


	if (joydev->open) {

		input_close_device(handle);

		wake_up_interruptible(&joydev->wait);

		list_for_each_entry(client, &joydev->client_list, node)

			kill_fasync(&client->fasync, SIGIO, POLL_HUP);

		wake_up_interruptible(&joydev->wait);

	} else

		joydev_free(joydev);

}

drivers/input/joystick/db9.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static struct db9_config db9_cfg[DB9_MAX_PORTS] __initdata; 


module_param_array_named(dev, db9_cfg[0].args, int, &db9_cfg[0].nargs, 0);

MODULE_PARM_DESC(dev, "Describes first attached device (<parport#>,<type>)");

module_param_array_named(dev2, db9_cfg[1].args, int, &db9_cfg[0].nargs, 0);

module_param_array_named(dev2, db9_cfg[1].args, int, &db9_cfg[1].nargs, 0);

MODULE_PARM_DESC(dev2, "Describes second attached device (<parport#>,<type>)");

module_param_array_named(dev3, db9_cfg[2].args, int, &db9_cfg[2].nargs, 0);

MODULE_PARM_DESC(dev3, "Describes third attached device (<parport#>,<type>)");

drivers/input/mouse/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ config MOUSE_PS2_ALPS 
	  If unsure, say Y.



config MOUSE_PS2_LOGIPS2PP

	bool "Logictech PS/2++ mouse protocol extension" if EMBEDDED

	bool "Logitech PS/2++ mouse protocol extension" if EMBEDDED

	default y

	depends on MOUSE_PS2

	help

drivers/input/mousedev.c

+1 −1
Original line number Diff line number Diff line
@@ -766,9 +766,9 @@ static void mousedev_disconnect(struct input_handle *handle) 


	if (mousedev->open) {

		input_close_device(handle);

		wake_up_interruptible(&mousedev->wait);

		list_for_each_entry(client, &mousedev->client_list, node)

			kill_fasync(&client->fasync, SIGIO, POLL_HUP);

		wake_up_interruptible(&mousedev->wait);

	} else

		mousedev_free(mousedev);

}