Commit fb378df5 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 

Pull second round of input updates from Dmitry Torokhov:
 "Mostly simple bug fixes, although we do have one brand new driver for
  Microchip AR1021 i2c touchscreen.

  Also there is the change to stop trying to use i8042 active
  multiplexing by default (it is still possible to activate it via
  i8042.nomux=0 on boxes that implement it)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - add Thrustmaster as Xbox 360 controller vendor
  Input: xpad - add USB ID for Thrustmaster Ferrari 458 Racing Wheel
  Input: max77693-haptic - fix state check in imax77693_haptic_disable()
  Input: xen-kbdfront - free grant table entry in xenkbd_disconnect_backend
  Input: alps - fix v4 button press recognition
  Input: i8042 - disable active multiplexing by default
  Input: i8042 - add noloop quirk for Asus X750LN
  Input: synaptics - gate forcepad support by DMI check
  Input: Add Microchip AR1021 i2c touchscreen
  Input: cros_ec_keyb - add of match table
  Input: serio - avoid negative serio device numbers
  Input: avoid negative input device numbers
  Input: automatically set EV_ABS bit in input_set_abs_params
  Input: adp5588-keys - cancel workqueue in failure path
  Input: opencores-kbd - switch to using managed resources
  Input: evdev - fix EVIOCG{type} ioctl
parents 2eb7f910 4dfb15cd

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -1260,7 +1260,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	i8042.noloop	[HW] Disable the AUX Loopback command while probing

			     for the AUX port

	i8042.nomux	[HW] Don't check presence of an active multiplexing

			     controller

			     controller. Default: true.

	i8042.nopnp	[HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX

			     controllers

	i8042.notimeout	[HW] Ignore timeout condition signalled by controller

drivers/input/evdev.c

+8 −5
Original line number Diff line number Diff line
@@ -738,20 +738,23 @@ static int evdev_handle_set_keycode_v2(struct input_dev *dev, void __user *p) 
 */

static int evdev_handle_get_val(struct evdev_client *client,

				struct input_dev *dev, unsigned int type,

				unsigned long *bits, unsigned int max,

				unsigned int size, void __user *p, int compat)

				unsigned long *bits, unsigned int maxbit,

				unsigned int maxlen, void __user *p,

				int compat)

{

	int ret;

	unsigned long *mem;

	size_t len;



	mem = kmalloc(sizeof(unsigned long) * max, GFP_KERNEL);

	len = BITS_TO_LONGS(maxbit) * sizeof(unsigned long);

	mem = kmalloc(len, GFP_KERNEL);

	if (!mem)

		return -ENOMEM;



	spin_lock_irq(&dev->event_lock);

	spin_lock(&client->buffer_lock);



	memcpy(mem, bits, sizeof(unsigned long) * max);

	memcpy(mem, bits, len);



	spin_unlock(&dev->event_lock);
@@ -759,7 +762,7 @@ static int evdev_handle_get_val(struct evdev_client *client, 


	spin_unlock_irq(&client->buffer_lock);



	ret = bits_to_user(mem, max, size, p, compat);

	ret = bits_to_user(mem, maxbit, maxlen, p, compat);

	if (ret < 0)

		evdev_queue_syn_dropped(client);

drivers/input/input.c

+3 −2
Original line number Diff line number Diff line
@@ -498,7 +498,8 @@ void input_set_abs_params(struct input_dev *dev, unsigned int axis, 
	absinfo->fuzz = fuzz;

	absinfo->flat = flat;



	dev->absbit[BIT_WORD(axis)] |= BIT_MASK(axis);

	__set_bit(EV_ABS, dev->evbit);

	__set_bit(axis, dev->absbit);

}

EXPORT_SYMBOL(input_set_abs_params);
@@ -1788,7 +1789,7 @@ struct input_dev *input_allocate_device(void) 
		INIT_LIST_HEAD(&dev->h_list);

		INIT_LIST_HEAD(&dev->node);



		dev_set_name(&dev->dev, "input%ld",

		dev_set_name(&dev->dev, "input%lu",

			     (unsigned long) atomic_inc_return(&input_no) - 1);



		__module_get(THIS_MODULE);

drivers/input/joystick/xpad.c

+2 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static const struct xpad_device { 
	{ 0x24c6, 0x5501, "Hori Real Arcade Pro VX-SA", 0, XTYPE_XBOX360 },

	{ 0x24c6, 0x5506, "Hori SOULCALIBUR V Stick", 0, XTYPE_XBOX360 },

	{ 0x24c6, 0x5b02, "Thrustmaster, Inc. GPX Controller", 0, XTYPE_XBOX360 },

	{ 0x24c6, 0x5b03, "Thrustmaster Ferrari 458 Racing Wheel", 0, XTYPE_XBOX360 },

	{ 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },

	{ 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN }

};
@@ -292,6 +293,7 @@ static const signed short xpad_abs_triggers[] = { 


static struct usb_device_id xpad_table[] = {

	{ USB_INTERFACE_INFO('X', 'B', 0) },	/* X-Box USB-IF not approved class */

	XPAD_XBOX360_VENDOR(0x044f),		/* Thrustmaster X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x045e),		/* Microsoft X-Box 360 controllers */

	XPAD_XBOXONE_VENDOR(0x045e),		/* Microsoft X-Box One controllers */

	XPAD_XBOX360_VENDOR(0x046d),		/* Logitech X-Box 360 style controllers */

drivers/input/keyboard/adp5588-keys.c

+1 −0
Original line number Diff line number Diff line
@@ -587,6 +587,7 @@ static int adp5588_probe(struct i2c_client *client, 


 err_free_irq:

	free_irq(client->irq, kpad);

	cancel_delayed_work_sync(&kpad->work);

 err_unreg_dev:

	input_unregister_device(input);

	input = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE