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

Commit ecd649b3 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 updates from Dmitry Torokhov:
 "Just a few driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: atmel_mxt_ts - add missing compatible strings to OF device table
  Input: atmel_mxt_ts - fix the firmware update
  Input: atmel_mxt_ts - add touchpad button mapping for Samsung Chromebook Pro
  MAINTAINERS: Rakesh Iyer can't be reached anymore
  Input: hideep_ts - fix a typo in Kconfig
  Input: alps - fix reporting pressure of v3 trackstick
  Input: leds - fix out of bound access
  Input: synaptics-rmi4 - fix an unchecked out of memory error path
parents 3b6f9793 f6eeb9e5

Documentation/devicetree/bindings/input/atmel,maxtouch.txt

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ Required properties: 
- compatible:

    atmel,maxtouch



    The following compatibles have been used in various products but are

    deprecated:

	atmel,qt602240_ts

	atmel,atmel_mxt_ts

	atmel,atmel_mxt_tp

	atmel,mXT224



- reg: The I2C address of the device



- interrupts: The sink for the touchpad's IRQ output

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -13853,7 +13853,6 @@ S: Supported 
F:	drivers/iommu/tegra*



TEGRA KBC DRIVER

M:	Rakesh Iyer <riyer@nvidia.com>

M:	Laxman Dewangan <ldewangan@nvidia.com>

S:	Supported

F:	drivers/input/keyboard/tegra-kbc.c

drivers/input/input-leds.c

+4 −4
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static int input_leds_connect(struct input_handler *handler, 
			      const struct input_device_id *id)

{

	struct input_leds *leds;

	struct input_led *led;

	unsigned int num_leds;

	unsigned int led_code;

	int led_no;
@@ -119,14 +120,13 @@ static int input_leds_connect(struct input_handler *handler, 


	led_no = 0;

	for_each_set_bit(led_code, dev->ledbit, LED_CNT) {

		struct input_led *led = &leds->leds[led_no];

		if (!input_led_info[led_code].name)

			continue;



		led = &leds->leds[led_no];

		led->handle = &leds->handle;

		led->code = led_code;



		if (!input_led_info[led_code].name)

			continue;



		led->cdev.name = kasprintf(GFP_KERNEL, "%s::%s",

					   dev_name(&dev->dev),

					   input_led_info[led_code].name);

drivers/input/mouse/alps.c

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static void alps_process_trackstick_packet_v3(struct psmouse *psmouse) 


	x = (s8)(((packet[0] & 0x20) << 2) | (packet[1] & 0x7f));

	y = (s8)(((packet[0] & 0x10) << 3) | (packet[2] & 0x7f));

	z = packet[4] & 0x7c;

	z = packet[4] & 0x7f;



	/*

	 * The x and y values tend to be quite large, and when used

drivers/input/rmi4/rmi_spi.c

+5 −2
Original line number Diff line number Diff line
@@ -147,8 +147,11 @@ static int rmi_spi_xfer(struct rmi_spi_xport *rmi_spi, 
	if (len > RMI_SPI_XFER_SIZE_LIMIT)

		return -EINVAL;



	if (rmi_spi->xfer_buf_size < len)

		rmi_spi_manage_pools(rmi_spi, len);

	if (rmi_spi->xfer_buf_size < len) {

		ret = rmi_spi_manage_pools(rmi_spi, len);

		if (ret < 0)

			return ret;

	}



	if (addr == 0)

		/*