Commit 632f8577 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 input fixes from Dmitry Torokhov:
 "Just a few assorted driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elants_i2c - fix wake-on-touch
  Input: elan_i2c - set input device's vendor and product IDs
  Input: sun4i-lradc-keys - fix typo in binding documentation
  Input: atmel_mxt_ts - add maxtouch to I2C table for module autoload
  Input: arizona-haptic - fix disabling of haptics device
  Input: aiptek - fix crash on detecting device without endpoints
  Input: atmel_mxt_ts - add generic platform data for Chromebooks
  Input: parkbd - clear unused function pointers
  Input: walkera0701 - clear unused function pointers
  Input: turbografx - clear unused function pointers
  Input: gamecon - clear unused function pointers
  Input: db9 - clear unused function pointers
parents 1eab0e42 478e5ed1

Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Each key is represented as a sub-node of "allwinner,sun4i-a10-lradc-keys": 
Required subnode-properties:

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.

	- channel: Channel this key is attached to, mut be 0 or 1.

	- channel: Channel this key is attached to, must be 0 or 1.

	- voltage: Voltage in µV at lradc input when this key is pressed.



Example:

drivers/input/joystick/db9.c

+1 −0
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ static void db9_attach(struct parport *pp) 
		return;

	}



	memset(&db9_parport_cb, 0, sizeof(db9_parport_cb));

	db9_parport_cb.flags = PARPORT_FLAG_EXCL;



	pd = parport_register_dev_model(pp, "db9", &db9_parport_cb, port_idx);

drivers/input/joystick/gamecon.c

+1 −0
Original line number Diff line number Diff line
@@ -951,6 +951,7 @@ static void gc_attach(struct parport *pp) 
	pads = gc_cfg[port_idx].args + 1;

	n_pads = gc_cfg[port_idx].nargs - 1;



	memset(&gc_parport_cb, 0, sizeof(gc_parport_cb));

	gc_parport_cb.flags = PARPORT_FLAG_EXCL;



	pd = parport_register_dev_model(pp, "gamecon", &gc_parport_cb,

drivers/input/joystick/turbografx.c

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ static void tgfx_attach(struct parport *pp) 
	n_buttons = tgfx_cfg[port_idx].args + 1;

	n_devs = tgfx_cfg[port_idx].nargs - 1;



	memset(&tgfx_parport_cb, 0, sizeof(tgfx_parport_cb));

	tgfx_parport_cb.flags = PARPORT_FLAG_EXCL;



	pd = parport_register_dev_model(pp, "turbografx", &tgfx_parport_cb,

drivers/input/joystick/walkera0701.c

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ static void walkera0701_attach(struct parport *pp) 


	w->parport = pp;



	memset(&walkera0701_parport_cb, 0, sizeof(walkera0701_parport_cb));

	walkera0701_parport_cb.flags = PARPORT_FLAG_EXCL;

	walkera0701_parport_cb.irq_func = walkera0701_irq_handler;

	walkera0701_parport_cb.private = w;

CRA Git | Maintained and supported by SUSTech CRA and CCSE